texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Remove end_command extra key


From: Patrice Dumas
Subject: branch master updated: Remove end_command extra key
Date: Wed, 07 Sep 2022 15:59:57 -0400

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 8eef7ce840 Remove end_command extra key
8eef7ce840 is described below

commit 8eef7ce84066dbb8b55e73bce7446433ec24aa53
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Sep 7 21:59:43 2022 +0200

    Remove end_command extra key
    
    * tp/Texinfo/ParserNonXS.pm (_end_line),
    tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line),
    tp/Texinfo/Structuring.pm (new_block_command): do not set
    end_command extra key, the end command, if existing should
    always be the last content of the block command.
---
 ChangeLog                                          |  10 ++
 tp/Texinfo/ParserNonXS.pm                          |   5 -
 tp/Texinfo/Structuring.pm                          |   3 +-
 tp/Texinfo/XS/parsetexi/end_line.c                 |   1 -
 tp/t/results/alias/alias_table_command.pl          |   2 -
 tp/t/results/columnfractions/empty.pl              |   2 -
 tp/t/results/columnfractions/empty_comment.pl      |   2 -
 tp/t/results/columnfractions/good.pl               |   2 -
 tp/t/results/columnfractions/good_comment.pl       |   2 -
 tp/t/results/columnfractions/good_space_comment.pl |   2 -
 tp/t/results/columnfractions/invalid.pl            |   2 -
 tp/t/results/columnfractions/not_fraction.pl       |   2 -
 .../something_before_columnfractions.pl            |   2 -
 tp/t/results/columnfractions/wrong_command.pl      |   2 -
 tp/t/results/conditionals/many_conditionals.pl     |   8 --
 .../results/converters_tests/at_commands_in_raw.pl |   8 --
 tp/t/results/converters_tests/combined_fonts.pl    |   4 -
 tp/t/results/converters_tests/complex_nestings.pl  |  12 ---
 .../converters_tests/definition_commands.pl        |  38 -------
 .../email_table_command_as_argument.pl             |   2 -
 .../converters_tests/enumerate_above_ten.pl        |   2 -
 tp/t/results/converters_tests/form_feeds.pl        |   8 --
 .../converters_tests/frenchspacing_and_code.pl     |  16 ---
 tp/t/results/converters_tests/image_formatting.pl  |   4 -
 .../index_entry_in_preformatted.pl                 |   4 -
 tp/t/results/converters_tests/line_breaks.pl       |   8 --
 tp/t/results/converters_tests/non_empty_part.pl    |   7 +-
 .../non_empty_part_no_top_node_output.pl           |   7 +-
 .../converters_tests/normal_font_in_monospace.pl   |   4 -
 .../results/converters_tests/raw_block_commands.pl |  20 ----
 .../raw_block_commands_expand_tex.pl               |  20 ----
 tp/t/results/converters_tests/ref_in_sectioning.pl |   7 +-
 .../references_to_top_no_top_output.pl             |   8 --
 .../some_at_commands_in_ref_nodes.pl               |   7 +-
 tp/t/results/converters_tests/sp_in_example.pl     |   4 -
 .../converters_tests/spaces_in_empty_node_names.pl |   7 +-
 .../converters_tests/spaces_in_node_names.pl       |   7 +-
 .../table_in_display_in_example.pl                 |  10 --
 .../table_in_example_in_display.pl                 |  10 --
 .../converters_tests/test_deftypefnnewline.pl      |  28 -----
 .../converters_tests/things_before_setfilename.pl  |   8 --
 .../things_before_setfilename_no_element.pl        |   8 --
 tp/t/results/coverage/block_commands.pl            |   8 --
 tp/t/results/coverage/cartouche.pl                 |   4 -
 tp/t/results/coverage/cartouche_in_example.pl      |   8 --
 tp/t/results/coverage/cartouche_in_quotation.pl    |   8 --
 tp/t/results/coverage/commands_in_math.pl          |  16 ---
 tp/t/results/coverage/comment_on_cartouche_line.pl |   2 -
 tp/t/results/coverage/comment_on_group_line.pl     |   2 -
 tp/t/results/coverage/def.pl                       |   6 --
 tp/t/results/coverage/displaymath.pl               |  16 ---
 tp/t/results/coverage/exdent_and_commands.pl       |   8 --
 tp/t/results/coverage/exdent_and_formats.pl        |  56 ----------
 tp/t/results/coverage/flushleft_flushright.pl      |   8 --
 .../coverage/flushleft_flushright_in_quotation.pl  |  12 ---
 tp/t/results/coverage/flushright_example_nested.pl |  16 ---
 .../coverage/formats_only_title_comments.pl        |  12 +--
 tp/t/results/coverage/formats_only_titles.pl       |  12 +--
 tp/t/results/coverage/formats_titles.pl            |  12 +--
 .../coverage/group_beginning_and_end_on_line.pl    |   2 -
 tp/t/results/coverage/indentedblock.pl             |   4 -
 tp/t/results/coverage/insertcopying.pl             |   8 --
 tp/t/results/coverage/item_container.pl            |   8 +-
 tp/t/results/coverage/multitable.pl                |   4 -
 tp/t/results/coverage/nested_block_commands.pl     |  96 -----------------
 tp/t/results/coverage/preformatted.pl              |  10 --
 .../coverage/punctuation_in_line_commands.pl       |   8 --
 tp/t/results/coverage/quotation_author.pl          |   4 +-
 tp/t/results/coverage/raggedright.pl               |   4 -
 tp/t/results/coverage/symbol_after_block.pl        |  36 -------
 tp/t/results/coverage/symbol_after_command.pl      |   2 -
 tp/t/results/coverage/table.pl                     |   6 --
 tp/t/results/coverage/table_command_comment.pl     |   2 -
 tp/t/results/coverage_braces/caption_not_closed.pl |   2 -
 .../format_on_first_footnote_line.pl               |   8 --
 tp/t/results/coverage_braces/kbd.pl                |   8 --
 tp/t/results/coverage_braces/test_image.pl         |  10 --
 .../coverage_braces/two_footnotes_in_nodes.pl      |   7 +-
 .../two_footnotes_in_nodes_separate.pl             |   7 +-
 tp/t/results/def/all_commands.pl                   |  54 ----------
 tp/t/results/def/all_commands_delimiters.pl        |  94 -----------------
 .../def/all_commands_delimiters_printindex.pl      |  94 -----------------
 tp/t/results/def/all_commands_printindex.pl        |  54 ----------
 tp/t/results/def/all_empty_def.pl                  |  18 ----
 tp/t/results/def/ampchar.pl                        |   2 -
 tp/t/results/def/code_in_def.pl                    |   2 -
 tp/t/results/def/def_defx_mismatch.pl              |   2 -
 tp/t/results/def/defx_after_comment.pl             |   2 -
 tp/t/results/def/defx_after_comment_in_example.pl  |   6 --
 tp/t/results/def/defx_after_empty_line.pl          |   2 -
 .../def/defx_after_empty_line_in_example.pl        |   6 --
 tp/t/results/def/defx_after_paragraph_end.pl       |   2 -
 .../def/defx_after_preformatted_with_text.pl       |   6 --
 tp/t/results/def/defx_after_text.pl                |   2 -
 tp/t/results/def/defx_in_example.pl                |   6 --
 tp/t/results/def/double_command.pl                 |   4 -
 tp/t/results/def/empty_def_arguments.pl            |   2 -
 tp/t/results/def/empty_def_command.pl              |   4 -
 tp/t/results/def/empty_deftype.pl                  |   8 --
 tp/t/results/def/empty_deftypeop_name.pl           |   2 -
 tp/t/results/def/end_of_lines_protected.pl         |   2 -
 .../def/end_of_lines_protected_in_footnote.pl      |   2 -
 tp/t/results/def/inter_item_commands_in_def.pl     |   2 -
 .../def/inter_item_commands_in_def_in_example.pl   |   6 --
 tp/t/results/def/leading_space_in_def_arg.pl       |   2 -
 tp/t/results/def/no_category_or_no_name.pl         |   6 --
 tp/t/results/def/omit_def_space.pl                 |   2 -
 tp/t/results/def/protected_brace.pl                |   2 -
 tp/t/results/def/ref_in_def.pl                     |   2 -
 tp/t/results/def/space_in_def_for_index.pl         |   2 -
 tp/t/results/def/wrong_braces_simple.pl            |  10 --
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |   4 -
 ...pty_quotation_with_arg_followed_by_quotation.pl |   6 --
 .../docbook_tests/special_docbook_unnumbered.pl    |   7 +-
 tp/t/results/float/anchor_in_caption.pl            |   2 -
 tp/t/results/float/cindex_in_caption.pl            |   2 -
 .../results/float/comment_space_comand_in_float.pl |   2 -
 tp/t/results/float/complex_float.pl                |  35 +-----
 tp/t/results/float/empty_caption.pl                |   6 --
 tp/t/results/float/empty_label_no_space.pl         |   2 -
 tp/t/results/float/empty_label_no_space_comment.pl |   2 -
 tp/t/results/float/empty_label_with_space.pl       |   2 -
 .../float/empty_label_with_space_comment.pl        |   2 -
 .../float/empty_listoffloats_with_floats.pl        |   8 --
 tp/t/results/float/float_copying.pl                |  13 +--
 tp/t/results/float/float_with_at_commands.pl       |   2 -
 tp/t/results/float/footnote_in_caption.pl          |   2 -
 .../results/float/footnote_in_caption_and_error.pl |   2 -
 .../float/numbering_captions_listoffloats.pl       |  70 +-----------
 tp/t/results/float/ref_to_float.pl                 |   4 -
 tp/t/results/float/simple.pl                       |   2 -
 .../formats_encodings/at_commands_in_refs.pl       |   7 +-
 .../at_commands_in_refs_latin1.pl                  |   7 +-
 .../formats_encodings/at_commands_in_refs_utf8.pl  |   7 +-
 .../char_latin1_latin1_in_refs.pl                  |   7 +-
 .../formats_encodings/char_latin1_utf8_in_refs.pl  |   7 +-
 .../char_latin2_latin2_in_refs.pl                  |   7 +-
 .../documentencoding_utf8_and_insertions.pl        |   4 -
 .../formats_encodings/japanese_shift_jis.pl        |  11 +-
 .../no_documentencoding_and_insertions.pl          |   4 -
 tp/t/results/formats_encodings/sample_utf8.pl      |  17 +--
 tp/t/results/formatting/cond.pl                    |   8 --
 .../results/formatting/cond_ifhtml_ifinfo_iftex.pl |   8 --
 tp/t/results/formatting/cond_info.pl               |   8 --
 .../formatting/cond_info_ifhtml_ifinfo_iftex.pl    |   8 --
 .../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl      |   8 --
 .../cond_no-ifhtml_no-ifinfo_no-iftex.pl           |   8 --
 tp/t/results/formatting/cond_xml.pl                |   8 --
 tp/t/results/formatting/defcondx_Dbar.pl           |   2 -
 tp/t/results/formatting/defcondx_Ubar.pl           |   2 -
 .../formatting/direntry_dircategory_info_split.pl  |  19 +---
 tp/t/results/formatting/float_copying.pl           |  13 +--
 tp/t/results/formatting/split_nocopying.pl         |   7 +-
 tp/t/results/formatting/split_nocopying_split.pl   |   7 +-
 tp/t/results/formatting/texi_bib_example.pl        |   9 +-
 tp/t/results/formatting/texi_cond.pl               |   8 --
 tp/t/results/formatting/texi_glossary.pl           |   7 +-
 tp/t/results/heading/heading_in_copying.pl         |   4 -
 tp/t/results/heading/heading_in_example.pl         |   4 -
 tp/t/results/heading/heading_in_quotation.pl       |   4 -
 tp/t/results/html_tests/check_htmlxref.pl          |   7 +-
 .../html_tests/check_htmlxref_ignore_ref_top_up.pl |   7 +-
 tp/t/results/html_tests/check_htmlxref_menu.pl     |   7 +-
 .../html_tests/check_htmlxref_no_use_nodes.pl      |   7 +-
 tp/t/results/html_tests/commands_in_abbr.pl        |   4 -
 tp/t/results/html_tests/commands_in_alt.pl         |   4 -
 .../deftypefnnewline_for_copying_after.pl          |   8 --
 .../deftypefnnewline_for_copying_before.pl         |   8 --
 tp/t/results/html_tests/documentdescription.pl     |   4 -
 .../html_tests/example_at_commands_arguments.pl    |   2 -
 tp/t/results/html_tests/example_class.pl           |   2 -
 tp/t/results/html_tests/example_empty_arguments.pl |   6 --
 tp/t/results/html_tests/example_multi_class.pl     |   2 -
 tp/t/results/html_tests/html_in_copying.pl         |   8 --
 tp/t/results/html_tests/itemize_arguments.pl       |  64 -----------
 .../itemize_arguments_enable_encoding.pl           |  64 -----------
 tp/t/results/html_tests/mathjax_with_texinfo.pl    |   4 -
 .../mathjax_with_texinfo_enable_encoding.pl        |   4 -
 .../mathjax_with_texinfo_no_convert_to_latex.pl    |   4 -
 tp/t/results/html_tests/raw_html.pl                |   4 -
 tp/t/results/html_tests/redirection_same_labels.pl |  21 +---
 tp/t/results/html_tests/ref_in_preformatted.pl     |  11 +-
 tp/t/results/html_tests/simple_menu.pl             |  51 ++-------
 tp/t/results/html_tests/simple_menu_in_example.pl  |  16 ---
 .../html_tests/test_xrefautomaticsectiontitle.pl   |   7 +-
 .../test_xrefautomaticsectiontitle_off_first.pl    |   7 +-
 tp/t/results/html_tests/tex_expanded_in_copying.pl |   8 --
 .../verbatim_in_multitable_in_example.pl           |   6 --
 tp/t/results/htmlxref/htmlxref.pl                  |  70 +-----------
 tp/t/results/htmlxref/htmlxref_nodes.pl            |  70 +-----------
 tp/t/results/htmlxref/htmlxref_only_mono.pl        |  70 +-----------
 tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl  |  70 +-----------
 tp/t/results/htmlxref/htmlxref_only_split.pl       |  70 +-----------
 tp/t/results/htmlxref/htmlxref_only_split_nodes.pl |  70 +-----------
 tp/t/results/indices/double_index_entry.pl         |   7 +-
 tp/t/results/indices/empty_index_entry.pl          |   2 -
 tp/t/results/indices/empty_string_index_entry.pl   |   4 -
 tp/t/results/indices/ftable_vtable.pl              |   4 -
 tp/t/results/indices/index_entry_before_node.pl    |   7 +-
 .../index_entry_in_footnote_different_node_end.pl  |   7 +-
 .../indices/index_entry_in_footnote_separate.pl    |   7 +-
 .../indices/printindex_index_entry_in_copying.pl   |  15 +--
 ...rintindex_index_entry_in_copying_in_footnote.pl |  11 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  15 +--
 .../indices/same_index_entry_merged_indices.pl     |   4 -
 tp/t/results/info_tests/before_node_and_section.pl |  11 +-
 tp/t/results/info_tests/center_flush.pl            |   8 --
 tp/t/results/info_tests/colon_in_index_entry.pl    |   4 -
 .../info_tests/colons_in_index_entries_and_node.pl |  11 +-
 .../colons_in_index_entries_and_node_no_quoting.pl |  11 +-
 tp/t/results/info_tests/def_in_copying.pl          |   8 --
 .../direntry_dircategory_and_commands.pl           |   8 --
 .../end_of_line_command_in_node_lines.pl           |   7 +-
 tp/t/results/info_tests/error_in_footnote.pl       |   2 -
 tp/t/results/info_tests/float_long_captions.pl     |   4 -
 tp/t/results/info_tests/index_entry_at_end_node.pl |   7 +-
 .../info_tests/invalid_node_name_no_warning.pl     |   7 +-
 .../info_tests/invalid_node_name_warning.pl        |   7 +-
 .../info_tests/multiline_image_and_align.pl        |   8 --
 .../multitable_anchor_and_index_entry.pl           |   4 -
 .../info_tests/nested_multitable_anchor_index.pl   |   4 -
 .../info_tests/paragraphindent_and_preamble.pl     |   4 -
 .../paragraphindent_in_preamble_and_in_document.pl |   4 -
 .../info_tests/paragraphindent_not_in_preamble.pl  |   4 -
 tp/t/results/info_tests/quote_node_names_info.pl   |   7 +-
 tp/t/results/info_tests/space_at_menu_end.pl       |   7 +-
 tp/t/results/info_tests/space_in_menu.pl           |   7 +-
 tp/t/results/info_tests/split_no_copying.pl        |   7 +-
 .../info_tests/split_test_before_first_node.pl     |   7 +-
 .../split_test_before_first_node_no_empty_line.pl  |   7 +-
 tp/t/results/info_tests/test_index.pl              |  11 +-
 tp/t/results/info_tests/text_before_node.pl        |   7 +-
 tp/t/results/info_tests/top_node_normalization.pl  |   7 +-
 .../info_tests/two_paragraphindent_in_preamble.pl  |   4 -
 ..._paragraphindent_in_preamble_and_in_document.pl |   4 -
 .../init_files_tests/documentation_examples.pl     |   4 -
 tp/t/results/invalid_nestings/bad_style_nesting.pl |   4 -
 tp/t/results/invalid_nestings/bad_tab_nesting.pl   |   2 -
 .../invalid_nestings/cartouche_in_style_command.pl |   4 -
 tp/t/results/invalid_nestings/center.pl            |   6 --
 .../invalid_nestings/def_in_style_command.pl       |   2 -
 .../def_not_closed_in_menu_description.pl          |   4 -
 .../invalid_nestings/enumerate_in_style_command.pl |   2 -
 .../invalid_nestings/example_in_style_command.pl   |   4 -
 .../invalid_nestings/float_in_style_command.pl     |   2 -
 .../flushright_in_style_command.pl                 |   4 -
 .../formats_not_closed_in_example.pl               |   4 -
 tp/t/results/invalid_nestings/in_errormsg.pl       |   2 -
 tp/t/results/invalid_nestings/in_table.pl          |   6 --
 tp/t/results/invalid_nestings/item_in_ref.pl       |   2 -
 .../itemx_in_itemize_enumerate_in_table.pl         |   8 +-
 .../invalid_nestings/menu_in_style_command.pl      |   7 +-
 .../multitable_in_style_command.pl                 |   2 -
 .../invalid_nestings/multitable_item_in_index.pl   |   2 -
 .../invalid_nestings/on_block_command_line.pl      |   4 -
 tp/t/results/invalid_nestings/on_def_line.pl       |   2 -
 tp/t/results/invalid_nestings/on_itemize_line.pl   |   4 -
 tp/t/results/invalid_nestings/quotation_in_ref.pl  |   4 -
 .../invalid_nestings/quotation_in_style_command.pl |   4 -
 tp/t/results/invalid_nestings/recursive_copying.pl |   4 -
 .../style_not_closed_in_block_command.pl           |   4 -
 .../style_not_closed_in_table_line.pl              |   2 -
 .../style_not_closed_no_newline_root_commands.pl   |   7 +-
 .../style_not_closed_root_commands.pl              |   7 +-
 tp/t/results/invalid_nestings/tab_in_index.pl      |   2 -
 tp/t/results/invalid_nestings/table_in_code.pl     |   2 -
 .../table_not_closed_in_menu_comment.pl            |   4 -
 .../table_not_closed_in_menu_description.pl        |   4 -
 .../results/invalid_nestings/table_on_item_line.pl |   2 -
 tp/t/results/itemize/accent_argument.pl            |   4 -
 tp/t/results/itemize/asis_as_itemize_argument.pl   |   2 -
 tp/t/results/itemize/bad_enumerate_arguments.pl    |  10 --
 .../itemize/comment_first_on_enumerate_line.pl     |   2 -
 .../itemize/comment_first_on_itemize_line.pl       |   2 -
 tp/t/results/itemize/empty_accent_argument.pl      |   6 --
 tp/t/results/itemize/enumerate_and_empty_lines.pl  |  20 ----
 tp/t/results/itemize/enumerate_argument.pl         |   6 --
 tp/t/results/itemize/enumerate_argument_item.pl    |   6 --
 tp/t/results/itemize/enumerate_in_example.pl       |   6 --
 tp/t/results/itemize/enumerate_letters.pl          |   2 -
 .../results/itemize/headitem_itemx_in_enumerate.pl |   2 -
 tp/t/results/itemize/headitem_itemx_in_itemize.pl  |   4 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  12 ---
 .../itemize/inter_item_commands_in_itemize.pl      |   8 +-
 tp/t/results/itemize/itemize_and_empty_lines.pl    |  46 +-------
 tp/t/results/itemize/itemize_in_example.pl         |  14 ---
 .../itemize/itemize_line_commands_with_brace.pl    |   4 -
 tp/t/results/itemize/itemize_long_item.pl          |  18 ----
 tp/t/results/itemize/table_in_itemize.pl           |   4 -
 tp/t/results/itemize/w_argument.pl                 |   2 -
 tp/t/results/languages/multiple.pl                 |  10 --
 tp/t/results/languages/multiple_in_preamble.pl     |  10 --
 .../languages/multiple_in_preamble_before_node.pl  |   8 --
 tp/t/results/languages/multiple_lang_chapters.pl   |  13 +--
 .../languages/multiple_lang_chapters_latex.pl      |  13 +--
 .../languages/multiple_lang_chapters_texi2html.pl  |  13 +--
 tp/t/results/languages/simple.pl                   |   2 -
 tp/t/results/languages/unknown_region.pl           |   2 -
 tp/t/results/latex_tests/anchor_in_copying.pl      |   4 -
 .../anchor_in_copying_insertcopying_chap.pl        |   4 -
 .../anchor_in_copying_insertcopying_titlepage.pl   |   8 --
 ...chor_in_copying_insertcopying_titlepage_chap.pl |   8 --
 tp/t/results/latex_tests/brace_in_index.pl         |   6 --
 tp/t/results/latex_tests/enumerate_arguments.pl    |  12 ---
 tp/t/results/latex_tests/example_in_cartouche.pl   |  12 ---
 tp/t/results/latex_tests/float_and_refs.pl         |   6 --
 tp/t/results/latex_tests/nested_enumerate.pl       |   8 --
 tp/t/results/latex_tests/nested_itemize.pl         |  16 +--
 .../setchapternewpage_on_odd_titlepage.pl          |   4 -
 tp/t/results/latex_tests/titlepage_and_headings.pl |   4 -
 .../titlepage_and_setchapternewpage_odd.pl         |   4 -
 .../titlepage_and_setchapternewpage_on.pl          |   4 -
 tp/t/results/latex_tests/titlepage_classical.pl    |   8 --
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |   4 -
 tp/t/results/latex_tests/titlepage_long_title.pl   |   4 -
 tp/t/results/latex_tests/titlepage_no_author.pl    |   4 -
 tp/t/results/latex_tests/titlepage_no_title.pl     |   4 -
 .../titlepage_with_commands_classical.pl           |  12 ---
 .../results/latex_tests/verbatim_in_smallformat.pl |   4 -
 tp/t/results/layout/navigation.pl                  |  21 +---
 tp/t/results/layout/navigation_chapter.pl          |  21 +---
 .../results/layout/navigation_chapter_no_header.pl |  21 +---
 .../navigation_chapter_no_header_vertical.pl       |  21 +---
 tp/t/results/layout/navigation_chapter_vertical.pl |  21 +---
 tp/t/results/layout/navigation_no_header.pl        |  21 +---
 .../layout/navigation_no_header_vertical.pl        |  21 +---
 tp/t/results/layout/navigation_node.pl             |  21 +---
 tp/t/results/layout/navigation_node_no_header.pl   |  21 +---
 .../layout/navigation_node_no_header_vertical.pl   |  21 +---
 tp/t/results/layout/navigation_node_vertical.pl    |  21 +---
 tp/t/results/layout/navigation_section.pl          |  21 +---
 .../results/layout/navigation_section_no_header.pl |  21 +---
 .../navigation_section_no_header_vertical.pl       |  21 +---
 tp/t/results/layout/navigation_section_vertical.pl |  21 +---
 tp/t/results/layout/navigation_vertical.pl         |  21 +---
 tp/t/results/layout/no_monolithic.pl               |   7 +-
 tp/t/results/macro/complete_macro_for_end.pl       |   4 -
 tp/t/results/macro/macro_for_end.pl                |   4 -
 tp/t/results/macro/macro_in_brace_command.pl       |   2 -
 tp/t/results/macro/macro_in_end_argument.pl        |   4 -
 tp/t/results/macro/macro_in_menu.pl                |   4 -
 tp/t/results/macro/macro_in_misc_commands.pl       |  11 +-
 tp/t/results/macro/space_macro_after_end.pl        |   4 -
 tp/t/results/menu/bad_beginning.pl                 |   4 -
 .../menu/block_commands_in_menu_description.pl     |  17 +--
 tp/t/results/menu/comment_on_menu_line.pl          |   2 -
 tp/t/results/menu/dash_in_menu.pl                  |   4 -
 tp/t/results/menu/detailmenu.pl                    |   8 --
 tp/t/results/menu/detailmenu_in_description.pl     |   8 --
 tp/t/results/menu/detailmenu_on_subnodes.pl        |  29 +----
 tp/t/results/menu/detailmenu_unknown_node.pl       |  11 +-
 .../menu/direntry_dircategory_after_first_node.pl  |   4 -
 tp/t/results/menu/empty_menu_entry_name.pl         |   7 +-
 tp/t/results/menu/entry_after_detailmenu.pl        |  15 +--
 tp/t/results/menu/example_in_menu_comment.pl       |   8 --
 tp/t/results/menu/example_in_menu_description.pl   |  11 +-
 tp/t/results/menu/formats_in_menu.pl               |  17 +--
 tp/t/results/menu/inlineraw_in_menu_description.pl |   7 +-
 tp/t/results/menu/invalid_info_menu_entry.pl       |   7 +-
 tp/t/results/menu/menu_entry_name.pl               |   4 -
 tp/t/results/menu/menu_entry_name_comment.pl       |   4 -
 tp/t/results/menu/menu_entry_no_entry.pl           |   4 -
 tp/t/results/menu/menu_entry_no_entry_location.pl  |   4 -
 tp/t/results/menu/menu_entry_node.pl               |   4 -
 tp/t/results/menu/menu_entry_node_comments.pl      |   4 -
 tp/t/results/menu/menu_in_deffn.pl                 |   6 --
 tp/t/results/menu/menu_in_example.pl               |  16 ---
 tp/t/results/menu/menu_node_unterminated.pl        |   7 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   7 +-
 tp/t/results/menu/menu_title_before_entries.pl     |   7 +-
 .../results/menu/missing_detailmenu_on_subnodes.pl |  21 +---
 tp/t/results/menu/multiple_menus.pl                |  14 +--
 tp/t/results/menu/no_colon_in_menu.pl              |   7 +-
 tp/t/results/menu/reference_to_external_manual.pl  |   7 +-
 tp/t/results/menu/sc_in_menu.pl                    |  19 +---
 tp/t/results/menu/simple.pl                        |   4 -
 tp/t/results/menu/simple_no_menu.pl                |   4 -
 .../menu/space_and_commands_in_menu_node.pl        |   7 +-
 tp/t/results/menu/submenu_in_example.pl            |  26 -----
 tp/t/results/menu/verb_in_menu_description.pl      |   7 +-
 .../codequoteundirected_codequotebacktick.pl       |  36 -------
 .../misc_commands/comment_space_command_on_line.pl |   2 -
 tp/t/results/misc_commands/double_exdent.pl        |   8 --
 tp/t/results/misc_commands/footnote_in_center.pl   |   6 --
 .../misc_commands/heading_command_in_commands.pl   |   8 --
 tp/t/results/misc_commands/indent_in_quotation.pl  |   4 -
 tp/t/results/misc_commands/kbdinputstyle.pl        |  12 ---
 .../misc_commands/kbdinputstyle_in_table.pl        |  36 -------
 .../misc_commands/noindent_after_smallexample.pl   |   4 -
 tp/t/results/misc_commands/test_allowcodebreaks.pl |  16 ---
 .../misc_commands/text_before_line_command.pl      |   4 +-
 tp/t/results/morecoverage/formatting_fr.pl         |  43 +-------
 tp/t/results/morecoverage/texi_formatting.pl       |  43 +-------
 tp/t/results/moreindices/double_index_entry.pl     |   7 +-
 tp/t/results/moreindices/index_split.pl            |  21 +---
 tp/t/results/moreindices/index_split_nodes.pl      |  21 +---
 tp/t/results/moreindices/nodes_before_top.pl       |  28 +----
 .../nodes_before_top_and_sections_monolithic.pl    |  28 +----
 .../moreindices/nodes_before_top_no_nodes.pl       |  28 +----
 tp/t/results/moreindices/nodes_before_top_nodes.pl |  28 +----
 tp/t/results/moreindices/split_chapter_index.pl    |  21 +---
 tp/t/results/moresectioning/equivalent_nodes.pl    |   9 +-
 .../moresectioning/equivalent_nodes_no_node.pl     |   9 +-
 .../moresectioning/more_sections_than_nodes.pl     |  14 +--
 tp/t/results/moresectioning/node_footnote_end.pl   |  14 +--
 .../moresectioning/node_footnote_separated.pl      |  14 +--
 .../moresectioning/node_footnote_use_node.pl       |  14 +--
 .../nodes_after_top_before_chapter.pl              |   7 +-
 ...s_after_top_before_chapter_use_nodes_chapter.pl |   7 +-
 .../nodes_after_top_before_section.pl              |   7 +-
 .../nodes_after_top_before_section_use_nodes.pl    |   7 +-
 ...s_after_top_before_section_use_nodes_chapter.pl |   7 +-
 .../moresectioning/placed_things_before_element.pl |   6 --
 tp/t/results/moresectioning/sectioning_frames.pl   |  28 +----
 .../results/moresectioning/top_node_up_explicit.pl |   7 +-
 .../results/moresectioning/top_node_up_implicit.pl |   7 +-
 .../moresectioning/two_footnotes_in_nodes.pl       |   7 +-
 .../two_footnotes_in_nodes_separated.pl            |   7 +-
 tp/t/results/multitable/empty_headitem.pl          |   2 -
 tp/t/results/multitable/empty_item_tab.pl          |   4 -
 .../multitable/empty_multitable_with_cells.pl      |   2 -
 .../inter_item_commands_in_multitable.pl           |   6 --
 .../multitable/multitable_begin_with_tab.pl        |   4 -
 ...ultitable_bracketed_no_inter_space_prototype.pl |   2 -
 ...titable_bracketed_prototype_empty_not_closed.pl |   2 -
 ...bracketed_prototype_empty_not_closed_comment.pl |   2 -
 ..._bracketed_prototype_empty_spaces_not_closed.pl |   2 -
 ...ed_prototype_empty_spaces_not_closed_comment.pl |   2 -
 .../multitable_bracketed_prototype_not_closed.pl   |   2 -
 ...table_bracketed_prototype_not_closed_comment.pl |   2 -
 ...bracketed_prototype_not_closed_space_comment.pl |   2 -
 .../multitable_empty_bracketed_prototype.pl        |   2 -
 tp/t/results/multitable/multitable_figure_space.pl |   2 -
 tp/t/results/multitable/multitable_in_example.pl   |   6 --
 .../multitable_one_column_too_much_cells.pl        |   2 -
 .../multitable_two_columns_too_much_cells.pl       |   2 -
 .../multitable/multitable_with_empty_item_tab.pl   |   2 -
 .../results/multitable/not_letters_in_prototype.pl |   2 -
 tp/t/results/multitable/paragraph_in_cells.pl      |   2 -
 .../results/multitable/prototype_brace_no_brace.pl |   2 -
 .../multitable/prototype_brace_no_brace_comment.pl |   2 -
 tp/t/results/multitable/prototype_no_brace.pl      |   2 -
 tp/t/results/multitable/ref_in_multitable.pl       |   2 -
 tp/t/results/multitable/w_in_multitable.pl         |   2 -
 tp/t/results/paragraph/commands_in_flushright.pl   |  30 ------
 tp/t/results/paragraph/comment_in_quotation.pl     |   8 --
 .../paragraph/paragraph_count_and_example.pl       |   4 -
 tp/t/results/paragraph/paragraph_indent_asis.pl    |   4 -
 .../at_commands_glued_in_example.pl                |   4 -
 .../plaintext_tests/empty_line_in_example_end.pl   |   4 -
 .../plaintext_tests/empty_multitable_in_itemize.pl |   4 -
 tp/t/results/plaintext_tests/expanded_tex.pl       |   4 -
 .../flushright_not_closed_and_format.pl            |   4 -
 tp/t/results/plaintext_tests/html_expanded.pl      |   4 -
 .../insert_copying_and_paragraph.pl                |   4 -
 .../plaintext_tests/isolated_html_expanded.pl      |   4 -
 .../itemize_in_headitem_in_example.pl              |  20 +---
 tp/t/results/plaintext_tests/japanese_utf8.pl      |  11 +-
 .../plaintext_tests/line_passed_and_formats.pl     | 117 +--------------------
 .../plaintext_tests/long_uref_after_item.pl        |   4 +-
 .../plaintext_tests/multiline_image_and_align.pl   |   4 -
 tp/t/results/plaintext_tests/multitable.pl         |  10 --
 .../multitable_in_example_extraneous_tab.pl        |   6 --
 .../plaintext_tests/nested_code_commands.pl        |   8 --
 .../plaintext_tests/nested_indentedblock.pl        |  16 ---
 tp/t/results/plaintext_tests/nested_multitable.pl  |   4 -
 .../plaintext_tests/protect_spaces_on_line.pl      |   4 -
 tp/t/results/plaintext_tests/quote_node_names.pl   |   7 +-
 .../sp_with_text_before_in_example.pl              |   4 -
 .../plaintext_tests/star_at_command_formatting.pl  |   8 --
 .../plaintext_tests/tab_in_table_in_example.pl     |   6 --
 .../results/plaintext_tests/tab_item_in_example.pl |   4 -
 tp/t/results/preformatted/caption_in_example.pl    |   6 --
 .../comment_example_and_blank_lines.pl             |  16 ---
 tp/t/results/preformatted/comments_in_example.pl   |  12 ---
 tp/t/results/preformatted/def_in_example.pl        |   6 --
 tp/t/results/preformatted/empty_line.pl            |   4 -
 .../preformatted/empty_line_style_command.pl       |   4 -
 .../preformatted/insertcopying_in_example.pl       |   4 -
 .../preformatted/nested_example_and_comment.pl     |  24 -----
 tp/t/results/preformatted/nested_formats.pl        |  16 ---
 tp/t/results/preformatted/page_in_example.pl       |   4 -
 tp/t/results/preformatted/quote_dash_in_display.pl |   4 -
 tp/t/results/preformatted/quote_dash_in_example.pl |   4 -
 .../preformatted/text_on_display_command_line.pl   |  16 ---
 .../preformatted/text_on_example_command_line.pl   |  16 ---
 tp/t/results/preformatted/titlefont_in_example.pl  |   4 -
 .../results/quotation/comment_on_quotation_line.pl |   2 -
 tp/t/results/quotation/empty_quotation.pl          |  10 --
 .../quotation/footnote_in_quotation_with_arg.pl    |   2 -
 .../quotation/only_comment_on_quotation_line.pl    |   2 -
 tp/t/results/quotation/quotation_and_author.pl     |  10 +-
 .../quotation/quotation_author_in_example.pl       |   8 +-
 .../quotation_beginning_and_end_on_line.pl         |   2 -
 .../space_at_commands_end_quotation_line.pl        |   4 -
 tp/t/results/quotation/standard_quotations.pl      |  12 ---
 tp/t/results/raw/beginning_and_end_on_line.pl      |   2 -
 tp/t/results/raw/braces_in_tex.pl                  |  12 ---
 tp/t/results/raw/displaymath.pl                    |   8 --
 tp/t/results/raw/inline_in_example.pl              |   4 -
 tp/t/results/raw/lone_braces_in_html.pl            |   8 --
 tp/t/results/raw/misc_raw.pl                       |   6 --
 tp/t/results/raw/misc_raw_comments.pl              |   4 -
 tp/t/results/raw/raw_commands_and_end_of_lines.pl  |  48 ---------
 tp/t/results/raw/raw_expanded_in_style.pl          |   4 -
 tp/t/results/raw/raw_in_example.pl                 |  20 ----
 tp/t/results/raw/raw_in_para.pl                    |   8 --
 tp/t/results/raw/raw_in_style.pl                   |   4 -
 tp/t/results/raw/verbatim_and_verbatiminclude.pl   |  20 ----
 tp/t/results/regions/anchor_in_copying.pl          |   4 -
 .../regions/anchor_in_copying_in_footnote.pl       |   4 -
 tp/t/results/regions/anchor_in_titlepage.pl        |   4 -
 .../regions/anchor_in_titlepage_titlepage.pl       |   4 -
 tp/t/results/regions/double_copying.pl             |   8 --
 tp/t/results/regions/format_in_titlepage.pl        |   8 --
 .../regions/format_in_titlepage_titlepage.pl       |   8 --
 tp/t/results/regions/ref_in_copying.pl             |  11 +-
 .../regions/ref_in_copying_insert_in_chapter.pl    |  11 +-
 tp/t/results/regions/today_in_copying.pl           |   4 -
 tp/t/results/sectioning/anchor_in_footnote.pl      |   7 +-
 .../sectioning/anchor_in_footnote_separate.pl      |   7 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |   7 +-
 .../chapter_node_before_and_after_part.pl          |   7 +-
 .../sectioning/character_and_spaces_in_refs.pl     |  14 +--
 .../sectioning/character_and_spaces_in_refs_out.pl |  14 +--
 tp/t/results/sectioning/complex.pl                 |  28 +----
 tp/t/results/sectioning/complex_split_at_node.pl   |  28 +----
 .../contents_at_end_document_after_node.pl         |   7 +-
 .../results/sectioning/double_node_anchor_float.pl |   6 --
 tp/t/results/sectioning/double_part.pl             |   7 +-
 tp/t/results/sectioning/double_top_in_menu.pl      |   7 +-
 tp/t/results/sectioning/empty_top_node_up.pl       |   7 +-
 tp/t/results/sectioning/equivalent_labels.pl       |   9 +-
 tp/t/results/sectioning/equivalent_nodes.pl        |   7 +-
 .../results/sectioning/explicit_node_directions.pl |   7 +-
 tp/t/results/sectioning/external_node_in_menu.pl   |   7 +-
 .../sectioning/in_menu_only_special_spaces_node.pl |   7 +-
 tp/t/results/sectioning/internal_top_node_up.pl    |   7 +-
 tp/t/results/sectioning/lone_Top_node.pl           |   7 +-
 tp/t/results/sectioning/loop_nodes.pl              |  21 +---
 tp/t/results/sectioning/lowered_subsubsection.pl   |  35 +-----
 tp/t/results/sectioning/menutextorder.pl           |  18 +---
 .../results/sectioning/more_sections_than_nodes.pl |  14 +--
 tp/t/results/sectioning/next_in_menu_is_below.pl   |  21 +---
 tp/t/results/sectioning/next_no_prev_to_node.pl    |   7 +-
 tp/t/results/sectioning/no_element.pl              |   6 --
 tp/t/results/sectioning/node_nested_parentheses.pl |   7 +-
 .../sectioning/node_part_chapter_after_chapter.pl  |   7 +-
 .../sectioning/node_part_chapter_after_top.pl      |   7 +-
 tp/t/results/sectioning/node_referenced_in_ref.pl  |   7 +-
 tp/t/results/sectioning/node_up_external_node.pl   |   7 +-
 tp/t/results/sectioning/nodename_parentheses.pl    |   7 +-
 .../nodes_after_top_before_chapter_nodes.pl        |   7 +-
 .../nodes_after_top_before_chapter_not_split.pl    |   7 +-
 ...ore_chapter_not_split_no_use_node_directions.pl |   7 +-
 .../nodes_after_top_before_chapter_sections.pl     |   7 +-
 .../nodes_after_top_before_section_nodes.pl        |   7 +-
 .../nodes_after_top_before_section_sections.pl     |   7 +-
 tp/t/results/sectioning/nodes_before_top.pl        |  14 +--
 .../nodes_no_node_top_explicit_directions.pl       |   7 +-
 .../non_automatic_internal_top_node_up.pl          |   7 +-
 .../non_automatic_top_node_up_and_url.pl           |   7 +-
 .../sectioning/non_automatic_top_node_up_url.pl    |   7 +-
 tp/t/results/sectioning/novalidate.pl              |   7 +-
 tp/t/results/sectioning/part_chapter_after_top.pl  |   7 +-
 tp/t/results/sectioning/part_node_after_top.pl     |   7 +-
 tp/t/results/sectioning/part_node_before_top.pl    |   7 +-
 .../sectioning/part_node_chapter_after_top.pl      |   7 +-
 .../sectioning/part_node_chapter_appendix.pl       |   7 +-
 .../sectioning/part_node_chapter_node_appendix.pl  |   7 +-
 .../sectioning/part_node_node_part_appendix.pl     |   7 +-
 tp/t/results/sectioning/part_node_part_appendix.pl |   7 +-
 .../sectioning/part_node_part_node_appendix.pl     |   7 +-
 .../sectioning/placed_things_before_element.pl     |   6 --
 .../sectioning/placed_things_before_node.pl        |   6 --
 .../sectioning/protected_node_parentheses.pl       |   7 +-
 tp/t/results/sectioning/raiselowersections.pl      |  28 +----
 tp/t/results/sectioning/rec_nodes.pl               |  29 +----
 tp/t/results/sectioning/section_before_top.pl      |   7 +-
 .../results/sectioning/section_below_unnumbered.pl |  14 +--
 .../sectioning/section_chapter_before_top_nodes.pl |  14 +--
 .../sectioning/section_in_unnumbered_info.pl       |  91 +++-------------
 .../sectioning/section_in_unnumbered_plaintext.pl  |  91 +++-------------
 tp/t/results/sectioning/semi_auto.pl               |  14 +--
 tp/t/results/sectioning/space_in_node.pl           |   7 +-
 tp/t/results/sectioning/special_spaces_in_nodes.pl |   7 +-
 .../sectioning/top_node_no_menu_direction.pl       |   7 +-
 tp/t/results/sectioning/top_node_up_url.pl         |   7 +-
 tp/t/results/sectioning/topic_guide.pl             |  53 ++--------
 .../transliterated_split_equivalent_nodes.pl       |   7 +-
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |   7 +-
 .../sectioning/two_nodes_between_chapters.pl       |   7 +-
 tp/t/results/sectioning/unknown_node_in_menu.pl    |   7 +-
 tp/t/results/value/set_in_item_missing_line.pl     |   4 -
 tp/t/results/value/set_on_item_line.pl             |   4 -
 tp/t/results/value/value_in_misc_commands.pl       |   4 -
 tp/t/results/value/value_in_node.pl                |  14 +--
 tp/t/results/xml_tests/commands_and_spaces.pl      |  20 ----
 tp/t/results/xml_tests/comments_end_lines.pl       |  32 +-----
 .../xml_tests/comments_on_block_command_lines.pl   |  40 -------
 tp/t/results/xml_tests/image_inline_or_not.pl      |  17 +--
 tp/t/results/xml_tests/raw.pl                      |   8 --
 tp/t/results/xml_tests/raw_and_comments.pl         |   4 -
 tp/t/results/xml_tests/spaces_info_lost.pl         |   2 -
 tp/t/results/xtable/accent_on_table_line.pl        |   4 -
 tp/t/results/xtable/block_commands_in_table.pl     |  20 ----
 .../xtable/comment_and_itemx_before_item.pl        |   2 -
 .../results/xtable/definfoenclose_on_table_line.pl |   2 -
 tp/t/results/xtable/empty_item_itemx.pl            |   2 -
 tp/t/results/xtable/headitem_in_table.pl           |   2 -
 .../results/xtable/inter_item_commands_in_table.pl |  22 ----
 .../inter_item_commands_in_table_in_example.pl     |   6 --
 .../xtable/invalid_command_and_brace_in_table.pl   |   2 -
 tp/t/results/xtable/itemx_before_item.pl           |   2 -
 tp/t/results/xtable/long_item.pl                   |   2 -
 .../xtable/no_arg_brace_command_on_table_line.pl   |   2 -
 tp/t/results/xtable/no_argument_for_table.pl       |   4 +-
 tp/t/results/xtable/table_nested.pl                |  28 -----
 tp/t/results/xtable/text_between_item_itemx.pl     |   2 -
 tp/t/results/xtable/title_and_itemx_before_item.pl |   2 -
 tp/t/test_utils.pl                                 |   2 +-
 621 files changed, 384 insertions(+), 6004 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 690bd333ca..23fa2e3fa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-09-07  Patrice Dumas  <pertusus@free.fr>
+
+       Remove end_command extra key
+
+       * tp/Texinfo/ParserNonXS.pm (_end_line),
+       tp/Texinfo/XS/parsetexi/end_line.c (end_line_misc_line),
+       tp/Texinfo/Structuring.pm (new_block_command): do not set
+       end_command extra key, the end command, if existing should
+       always be the last content of the block command.
+
 2022-09-07  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_close_command_cleanup),
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 72843ff1fd..219f5e0237 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3500,7 +3500,6 @@ sub _end_line($$$)
           = _close_commands($self, $current, $source_info, $end_command);
         my $inline_copying;
         if ($closed_command) {
-          $closed_command->{'extra'}->{'end_command'} = $misc_cmd;
           _close_command_cleanup($self, $closed_command);
           $end->{'parent'} = $closed_command;
 
@@ -7296,10 +7295,6 @@ The string correspond to the line after the @-command
 for @-commands that have special arguments on their line,
 and for C<@macro> line.
 
-=item end_command
-
-The C<@end> associated to the block @-command.
-
 =item index_entry
 
 The index entry information (described in L</index_entries>
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 61184856bc..74745fefb2 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1520,8 +1520,7 @@ sub new_block_command($$$)
      'extra' => {'spaces_after_argument' => "\n"}};
   push @{$end->{'args'}->[0]->{'contents'}},
          {'text' => $command_name, 'parent' => $end->{'args'}->[0]};
-  my $new_block = {'cmdname' => $command_name, 'parent' => $parent,
-                  'extra'=>{'end_command' => $end}};
+  my $new_block = {'cmdname' => $command_name, 'parent' => $parent};
   my $block_line_arg = {'type' => 'block_line_arg',
                         'parent' => $new_block,
                         'extra' => { 'spaces_after_argument' => "\n",}};
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index 7b6281d019..1fe73b42d2 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1824,7 +1824,6 @@ end_line_misc_line (ELEMENT *current)
             destroy_element_and_children (end_elt);
           else
             {
-              add_extra_element (closed_command, "end_command", end_elt);
               close_command_cleanup (closed_command);
 
               add_to_element_contents (closed_command, end_elt);
diff --git a/tp/t/results/alias/alias_table_command.pl 
b/tp/t/results/alias/alias_table_command.pl
index b7eb996f5c..faba65c36c 100644
--- a/tp/t/results/alias/alias_table_command.pl
+++ b/tp/t/results/alias/alias_table_command.pl
@@ -145,7 +145,6 @@ $result_trees{'alias_table_command'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -177,7 +176,6 @@ 
$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1
 
$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'alias_table_command'}{'contents'}[0];
 $result_trees{'alias_table_command'}{'contents'}[0]{'parent'} = 
$result_trees{'alias_table_command'};
 
diff --git a/tp/t/results/columnfractions/empty.pl 
b/tp/t/results/columnfractions/empty.pl
index 4c8484b8e9..1ad74b094d 100644
--- a/tp/t/results/columnfractions/empty.pl
+++ b/tp/t/results/columnfractions/empty.pl
@@ -70,7 +70,6 @@ $result_trees{'empty'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 0,
             'spaces_before_argument' => ' '
           },
@@ -94,7 +93,6 @@ 
$result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $res
 
$result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'empty'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'empty'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty'}{'contents'}[0];
 $result_trees{'empty'}{'contents'}[0]{'parent'} = $result_trees{'empty'};
 
diff --git a/tp/t/results/columnfractions/empty_comment.pl 
b/tp/t/results/columnfractions/empty_comment.pl
index cc95da7513..44c423b604 100644
--- a/tp/t/results/columnfractions/empty_comment.pl
+++ b/tp/t/results/columnfractions/empty_comment.pl
@@ -87,7 +87,6 @@ $result_trees{'empty_comment'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 0,
             'spaces_before_argument' => ' '
           },
@@ -113,7 +112,6 @@ 
$result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'
 
$result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'empty_comment'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_comment'}{'contents'}[0];
 $result_trees{'empty_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_comment'};
 
diff --git a/tp/t/results/columnfractions/good.pl 
b/tp/t/results/columnfractions/good.pl
index de3a6f94d7..02aba1bfb7 100644
--- a/tp/t/results/columnfractions/good.pl
+++ b/tp/t/results/columnfractions/good.pl
@@ -81,7 +81,6 @@ $result_trees{'good'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 3,
             'spaces_before_argument' => ' '
           },
@@ -107,7 +106,6 @@ 
$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'c
 
$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'good'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'good'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'good'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'} 
= $result_trees{'good'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'good'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'good'}{'contents'}[0];
 $result_trees{'good'}{'contents'}[0]{'parent'} = $result_trees{'good'};
 
diff --git a/tp/t/results/columnfractions/good_comment.pl 
b/tp/t/results/columnfractions/good_comment.pl
index 88971dc841..eb21c8e533 100644
--- a/tp/t/results/columnfractions/good_comment.pl
+++ b/tp/t/results/columnfractions/good_comment.pl
@@ -97,7 +97,6 @@ $result_trees{'good_comment'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 3,
             'spaces_before_argument' => ' '
           },
@@ -125,7 +124,6 @@ 
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args
 
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'good_comment'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
 = 
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'good_comment'}{'contents'}[0];
 $result_trees{'good_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'good_comment'};
 
diff --git a/tp/t/results/columnfractions/good_space_comment.pl 
b/tp/t/results/columnfractions/good_space_comment.pl
index 377a4a40ba..da765ddcc3 100644
--- a/tp/t/results/columnfractions/good_space_comment.pl
+++ b/tp/t/results/columnfractions/good_space_comment.pl
@@ -97,7 +97,6 @@ $result_trees{'good_space_comment'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -125,7 +124,6 @@ 
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]
 
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'good_space_comment'}{'contents'}[0];
 $result_trees{'good_space_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'good_space_comment'};
 
diff --git a/tp/t/results/columnfractions/invalid.pl 
b/tp/t/results/columnfractions/invalid.pl
index 66d10a0ee7..c50e648d53 100644
--- a/tp/t/results/columnfractions/invalid.pl
+++ b/tp/t/results/columnfractions/invalid.pl
@@ -75,7 +75,6 @@ $result_trees{'invalid'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 0,
             'spaces_before_argument' => ' '
           },
@@ -100,7 +99,6 @@ 
$result_trees{'invalid'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'} = $r
 
$result_trees{'invalid'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'invalid'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'invalid'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'invalid'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'invalid'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'invalid'}{'contents'}[0]{'contents'}[0];
-$result_trees{'invalid'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'} 
= $result_trees{'invalid'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'invalid'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'invalid'}{'contents'}[0];
 $result_trees{'invalid'}{'contents'}[0]{'parent'} = $result_trees{'invalid'};
 
diff --git a/tp/t/results/columnfractions/not_fraction.pl 
b/tp/t/results/columnfractions/not_fraction.pl
index ea1e91e4f6..ed2952c942 100644
--- a/tp/t/results/columnfractions/not_fraction.pl
+++ b/tp/t/results/columnfractions/not_fraction.pl
@@ -75,7 +75,6 @@ $result_trees{'not_fraction'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 0,
             'spaces_before_argument' => ' '
           },
@@ -100,7 +99,6 @@ 
$result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 
$result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0];
-$result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'not_fraction'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'not_fraction'}{'contents'}[0];
 $result_trees{'not_fraction'}{'contents'}[0]{'parent'} = 
$result_trees{'not_fraction'};
 
diff --git a/tp/t/results/columnfractions/something_before_columnfractions.pl 
b/tp/t/results/columnfractions/something_before_columnfractions.pl
index e57b05bb39..3d22633b6c 100644
--- a/tp/t/results/columnfractions/something_before_columnfractions.pl
+++ b/tp/t/results/columnfractions/something_before_columnfractions.pl
@@ -84,7 +84,6 @@ $result_trees{'something_before_columnfractions'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -111,7 +110,6 @@ 
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
 = 
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'something_before_columnfractions'}{'contents'}[0];
 $result_trees{'something_before_columnfractions'}{'contents'}[0]{'parent'} = 
$result_trees{'something_before_columnfractions'};
 
diff --git a/tp/t/results/columnfractions/wrong_command.pl 
b/tp/t/results/columnfractions/wrong_command.pl
index 0243a0a3a9..114bd29366 100644
--- a/tp/t/results/columnfractions/wrong_command.pl
+++ b/tp/t/results/columnfractions/wrong_command.pl
@@ -93,7 +93,6 @@ $result_trees{'wrong_command'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 0,
             'spaces_before_argument' => ' '
           },
@@ -120,7 +119,6 @@ 
$result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'
 
$result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'wrong_command'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'wrong_command'}{'contents'}[0];
 $result_trees{'wrong_command'}{'contents'}[0]{'parent'} = 
$result_trees{'wrong_command'};
 
diff --git a/tp/t/results/conditionals/many_conditionals.pl 
b/tp/t/results/conditionals/many_conditionals.pl
index 196aed0954..8ceeffcf8f 100644
--- a/tp/t/results/conditionals/many_conditionals.pl
+++ b/tp/t/results/conditionals/many_conditionals.pl
@@ -64,9 +64,6 @@ $result_trees{'many_conditionals'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -182,9 +179,6 @@ $result_trees{'many_conditionals'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -223,7 +217,6 @@ 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{
 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0];
-$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'many_conditionals'}{'contents'}[0];
 $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'many_conditionals'}{'contents'}[0];
 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[2];
@@ -241,7 +234,6 @@ 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10]{'contents'}[1]
 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0];
 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10]{'contents'}[2];
 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'parent'}
 = $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10];
-$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10]{'contents'}[2];
 $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'many_conditionals'}{'contents'}[0];
 $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'many_conditionals'}{'contents'}[0];
 $result_trees{'many_conditionals'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'many_conditionals'}{'contents'}[0];
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 479baaf612..f992a3c980 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -322,9 +322,6 @@ $result_trees{'at_commands_in_raw'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -443,9 +440,6 @@ $result_trees{'at_commands_in_raw'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -950,7 +944,6 @@ 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[0]
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[4];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[2]{'contents'}[0];
@@ -967,7 +960,6 @@ 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4]{'contents'}[1]
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4]{'contents'}[2];
 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4];
-$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4]{'contents'}[2];
 $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[4];
 $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[4];
 $result_trees{'at_commands_in_raw'}{'contents'}[4]{'contents'}[6]{'parent'} = 
$result_trees{'at_commands_in_raw'}{'contents'}[4];
diff --git a/tp/t/results/converters_tests/combined_fonts.pl 
b/tp/t/results/converters_tests/combined_fonts.pl
index 136c9c5a36..fadf1ad0ae 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -1382,9 +1382,6 @@ $result_trees{'combined_fonts'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1594,7 +1591,6 @@ 
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'p
 
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0];
 
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
 
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13];
-$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
 $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[13]{'parent'} = 
$result_trees{'combined_fonts'}{'contents'}[4];
 $result_trees{'combined_fonts'}{'contents'}[4]{'parent'} = 
$result_trees{'combined_fonts'};
 
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 7a43bfb392..ec6527278b 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1051,7 +1051,6 @@ $result_trees{'complex_nestings'} = {
                                       ],
                                       'extra' => {
                                         'command_as_argument' => {},
-                                        'end_command' => {},
                                         'spaces_before_argument' => ' '
                                       },
                                       'parent' => {},
@@ -1113,7 +1112,6 @@ $result_trees{'complex_nestings'} = {
                                 }
                               ],
                               'extra' => {
-                                'end_command' => {},
                                 'spaces_before_argument' => ' '
                               },
                               'parent' => {},
@@ -1158,7 +1156,6 @@ $result_trees{'complex_nestings'} = {
                         }
                       ],
                       'extra' => {
-                        'end_command' => {},
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -1203,7 +1200,6 @@ $result_trees{'complex_nestings'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -1255,9 +1251,6 @@ $result_trees{'complex_nestings'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1423,7 +1416,6 @@ 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2];
@@ -1432,26 +1424,22 @@ 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[4];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
 $result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'complex_nestings'}{'contents'}[4];
 $result_trees{'complex_nestings'}{'contents'}[4]{'parent'} = 
$result_trees{'complex_nestings'};
 
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 33850a3164..f232f401f8 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -366,7 +366,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -623,7 +622,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -916,7 +914,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5114,7 +5111,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7243,7 +7239,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8364,7 +8359,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10026,7 +10020,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10381,7 +10374,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10772,7 +10764,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10986,7 +10977,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11209,7 +11199,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11578,7 +11567,6 @@ $result_trees{'definition_commands'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -11618,9 +11606,6 @@ $result_trees{'definition_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -11882,7 +11867,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -12160,7 +12144,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -12657,7 +12640,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -17302,7 +17284,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -21561,7 +21542,6 @@ $result_trees{'definition_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -21640,7 +21620,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -21677,7 +21656,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0];
@@ -21718,7 +21696,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[6]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -22286,7 +22263,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'contents'}[16];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[8]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -22596,7 +22572,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[1
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'contents'}[16];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[9]{'parent'} = 
$result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[10]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -22755,7 +22730,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[6];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[6]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'contents'}[6];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[11]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[12]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -22961,7 +22935,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[3];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'contents'}[3];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[13]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[14]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -23011,7 +22984,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[15]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[16]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -23065,7 +23037,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[17]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[18]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[19]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
@@ -23097,7 +23068,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[22]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[23]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -23129,7 +23099,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[24]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[25]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'args'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26];
@@ -23180,12 +23149,10 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[0]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[1];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[1]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'contents'}[1];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[26]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[27]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -23224,7 +23191,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[28]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[29]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -23264,7 +23230,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[30]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[31]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[0]{'args'}[0];
@@ -23329,7 +23294,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[2]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[2];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[2]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'contents'}[2];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[32]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[33]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -23955,7 +23919,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'contents'}[16];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[34]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[35]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -24535,7 +24498,6 @@ 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16]{'args'}[0];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16];
 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16]{'parent'}
 = $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36];
-$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'extra'}{'end_command'}
 = 
$result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'contents'}[16];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[36]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'contents'}[37]{'parent'} 
= $result_trees{'definition_commands'}{'contents'}[4];
 $result_trees{'definition_commands'}{'contents'}[4]{'parent'} = 
$result_trees{'definition_commands'};
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 decc1c9989..813c0008c5 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
@@ -132,7 +132,6 @@ $result_trees{'email_table_command_as_argument'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -165,7 +164,6 @@ 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'
 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'email_table_command_as_argument'}{'contents'}[0];
 $result_trees{'email_table_command_as_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'email_table_command_as_argument'};
 
diff --git a/tp/t/results/converters_tests/enumerate_above_ten.pl 
b/tp/t/results/converters_tests/enumerate_above_ten.pl
index 8317ac478c..8a39445329 100644
--- a/tp/t/results/converters_tests/enumerate_above_ten.pl
+++ b/tp/t/results/converters_tests/enumerate_above_ten.pl
@@ -85,7 +85,6 @@ $result_trees{'enumerate_above_ten'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '14',
             'spaces_before_argument' => ' '
           },
@@ -111,7 +110,6 @@ 
$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_above_ten'}{'contents'}[0];
 $result_trees{'enumerate_above_ten'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_above_ten'};
 
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 5961a97999..34a1c4a038 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -386,9 +386,6 @@ $result_trees{'form_feeds'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -739,7 +736,6 @@ $result_trees{'form_feeds'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -958,7 +954,6 @@ $result_trees{'form_feeds'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'shortcaption' => {},
             'type' => {
               'normalized' => ''
@@ -1060,7 +1055,6 @@ 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'paren
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20]{'extra'}{'end_command'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[20]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[2];
 $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[21]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[2];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[22]{'args'}[0];
@@ -1105,7 +1099,6 @@ 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[1]{'paren
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[2];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'extra'}{'end_command'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'contents'}[2];
 $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[27]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[2];
 $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[28]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[2];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'args'}[0]{'parent'} 
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
@@ -1141,7 +1134,6 @@ 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[7]{'args'
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[7];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[7]{'parent'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29];
 $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'caption'} 
= $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[1];
-$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'end_command'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[7];
 
$result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'extra'}{'shortcaption'}
 = $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'contents'}[4];
 $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[29]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[2];
 $result_trees{'form_feeds'}{'contents'}[2]{'contents'}[30]{'parent'} = 
$result_trees{'form_feeds'}{'contents'}[2];
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index e9298a668e..1e64a554c2 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -310,9 +310,6 @@ $result_trees{'frenchspacing_and_code'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -642,7 +639,6 @@ $result_trees{'frenchspacing_and_code'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -947,7 +943,6 @@ $result_trees{'frenchspacing_and_code'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1182,9 +1177,6 @@ $result_trees{'frenchspacing_and_code'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1514,7 +1506,6 @@ $result_trees{'frenchspacing_and_code'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1819,7 +1810,6 @@ $result_trees{'frenchspacing_and_code'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1881,7 +1871,6 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[5]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[4];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[6]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[4];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -1926,7 +1915,6 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[7]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[4];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[8]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[4];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -1967,7 +1955,6 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9];
-$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[9]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[4];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[10]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[4];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[4]{'contents'}[11]{'args'}[0];
@@ -1997,7 +1984,6 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5]{'contents'}[1];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5]{'contents'}[1];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[5]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[6]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2042,7 +2028,6 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[7]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[8]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[6];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -2083,7 +2068,6 @@ 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[2]{'args'}[0];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9];
-$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'contents'}[2];
 
$result_trees{'frenchspacing_and_code'}{'contents'}[6]{'contents'}[9]{'parent'} 
= $result_trees{'frenchspacing_and_code'}{'contents'}[6];
 $result_trees{'frenchspacing_and_code'}{'contents'}[6]{'parent'} = 
$result_trees{'frenchspacing_and_code'};
 
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 122c627583..670b1c2d38 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2061,9 +2061,6 @@ $result_trees{'image_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2557,7 +2554,6 @@ 
$result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'
 
$result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3];
-$result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 $result_trees{'image_formatting'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'image_formatting'}{'contents'}[4];
 $result_trees{'image_formatting'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'image_formatting'}{'contents'}[4];
 
$result_trees{'image_formatting'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'image_formatting'}{'contents'}[4]{'contents'}[5]{'args'}[0];
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 9755b63758..11fb8be7a8 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -361,9 +361,6 @@ $result_trees{'index_entry_in_preformatted'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -434,7 +431,6 @@ 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'cont
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1];
-$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'index_entry_in_preformatted'}{'contents'}[4];
 $result_trees{'index_entry_in_preformatted'}{'contents'}[4]{'parent'} = 
$result_trees{'index_entry_in_preformatted'};
 
diff --git a/tp/t/results/converters_tests/line_breaks.pl 
b/tp/t/results/converters_tests/line_breaks.pl
index 1a14bc5b9c..5190e0f9b0 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -72,9 +72,6 @@ $result_trees{'line_breaks'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -367,7 +364,6 @@ $result_trees{'line_breaks'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -452,7 +448,6 @@ $result_trees{'line_breaks'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -477,7 +472,6 @@ 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'paren
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0];
-$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'line_breaks'}{'contents'}[0];
 $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'line_breaks'}{'contents'}[0];
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -518,7 +512,6 @@ 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'line_breaks'}{'contents'}[0];
 $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'line_breaks'}{'contents'}[0];
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'args'}[0];
@@ -530,7 +523,6 @@ 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'paren
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9];
-$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 $result_trees{'line_breaks'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'line_breaks'}{'contents'}[0];
 $result_trees{'line_breaks'}{'contents'}[0]{'parent'} = 
$result_trees{'line_breaks'};
 
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index 4b2caddf6e..9a0071b762 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -289,9 +289,6 @@ $result_trees{'non_empty_part'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -915,7 +912,6 @@ 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'pa
 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
 
$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1];
-$result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
 $result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'non_empty_part'}{'contents'}[3];
 $result_trees{'non_empty_part'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'non_empty_part'}{'contents'}[3];
 $result_trees{'non_empty_part'}{'contents'}[3]{'extra'}{'associated_part'} = 
$result_trees{'non_empty_part'}{'contents'}[1];
@@ -1332,8 +1328,7 @@ $result_nodes{'non_empty_part'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'node_preceding_part' => {},
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 5c02906035..b2b5c7fd2c 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
@@ -289,9 +289,6 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -915,7 +912,6 @@ 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1];
-$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'contents'}[2];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3];
 
$result_trees{'non_empty_part_no_top_node_output'}{'contents'}[3]{'extra'}{'associated_part'}
 = $result_trees{'non_empty_part_no_top_node_output'}{'contents'}[1];
@@ -1332,8 +1328,7 @@ $result_nodes{'non_empty_part_no_top_node_output'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'node_preceding_part' => {},
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 04d43f999f..3d244a6d6d 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -112,9 +112,6 @@ $result_trees{'normal_font_in_monospace'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -225,7 +222,6 @@ 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0];
-$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'normal_font_in_monospace'}{'contents'}[0];
 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'normal_font_in_monospace'}{'contents'}[0];
 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'normal_font_in_monospace'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl 
b/tp/t/results/converters_tests/raw_block_commands.pl
index ee75d5c122..c3008ec2ee 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -74,9 +74,6 @@ $result_trees{'raw_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -149,9 +146,6 @@ $result_trees{'raw_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -224,9 +218,6 @@ $result_trees{'raw_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -340,9 +331,6 @@ $result_trees{'raw_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -464,9 +452,6 @@ $result_trees{'raw_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -489,7 +474,6 @@ 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1];
-$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'raw_block_commands'}{'contents'}[0];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'raw_block_commands'}{'contents'}[0];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3];
@@ -499,7 +483,6 @@ 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3];
-$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'raw_block_commands'}{'contents'}[0];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'raw_block_commands'}{'contents'}[0];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5];
@@ -509,7 +492,6 @@ 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[0]
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5];
-$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'raw_block_commands'}{'contents'}[0];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'raw_block_commands'}{'contents'}[0];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7];
@@ -525,7 +507,6 @@ 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[0]
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7];
-$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'raw_block_commands'}{'contents'}[0];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'raw_block_commands'}{'contents'}[0];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9];
@@ -543,7 +524,6 @@ 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'contents'}[0]
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9];
-$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'raw_block_commands'}{'contents'}[0];
 $result_trees{'raw_block_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'raw_block_commands'};
 
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 e196ca3a8f..e69f36c567 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
@@ -74,9 +74,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -149,9 +146,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -224,9 +218,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -340,9 +331,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -464,9 +452,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -489,7 +474,6 @@ 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1]{'co
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1];
-$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3];
@@ -499,7 +483,6 @@ 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'co
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3];
-$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5];
@@ -509,7 +492,6 @@ 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'co
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5];
-$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7];
@@ -525,7 +507,6 @@ 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'co
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7];
-$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9];
@@ -543,7 +524,6 @@ 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'co
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9];
-$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0];
 $result_trees{'raw_block_commands_expand_tex'}{'contents'}[0]{'parent'} = 
$result_trees{'raw_block_commands_expand_tex'};
 
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index 1e99057212..c16b5c862c 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -439,9 +439,6 @@ $result_trees{'ref_in_sectioning'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2006,7 +2003,6 @@ 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{
 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1];
-$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 $result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'ref_in_sectioning'}{'contents'}[2];
 $result_trees{'ref_in_sectioning'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'ref_in_sectioning'}{'contents'}[2];
 $result_trees{'ref_in_sectioning'}{'contents'}[2]{'parent'} = 
$result_trees{'ref_in_sectioning'};
@@ -2552,8 +2548,7 @@ $result_nodes{'ref_in_sectioning'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 2f8ecdb409..8cfc55e191 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
@@ -156,9 +156,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -618,7 +615,6 @@ $result_trees{'references_to_top_no_top_output'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -1208,7 +1204,6 @@ $result_trees{'references_to_top_no_top_output'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -1302,7 +1297,6 @@ 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[0];
@@ -1371,7 +1365,6 @@ 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[3];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'contents'}[3];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'float_section'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[2];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'args'}[1]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'contents'}[0];
@@ -1463,7 +1456,6 @@ 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[3];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'parent'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[1];
-$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'contents'}[3];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'references_to_top_no_top_output'}{'contents'}[4];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'references_to_top_no_top_output'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
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 1526a35272..986a4f1d7f 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
@@ -485,9 +485,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1844,7 +1841,6 @@ 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'co
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2];
 $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'some_at_commands_in_ref_nodes'};
@@ -2160,8 +2156,7 @@ $result_nodes{'some_at_commands_in_ref_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/converters_tests/sp_in_example.pl 
b/tp/t/results/converters_tests/sp_in_example.pl
index 3f845f781a..89c6c08ce5 100644
--- a/tp/t/results/converters_tests/sp_in_example.pl
+++ b/tp/t/results/converters_tests/sp_in_example.pl
@@ -281,9 +281,6 @@ $result_trees{'sp_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -331,7 +328,6 @@ 
$result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'par
 
$result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'sp_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'sp_in_example'}{'contents'}[0];
 $result_trees{'sp_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'sp_in_example'};
 
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 d6878ed9cf..aa488365f7 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
@@ -279,9 +279,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -720,7 +717,6 @@ 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'conte
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'spaces_in_empty_node_names'}{'contents'}[1];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'spaces_in_empty_node_names'}{'contents'}[1];
 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_empty_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -816,8 +812,7 @@ $result_nodes{'spaces_in_empty_node_names'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 a4bb303914..4e067263cc 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -294,9 +294,6 @@ $result_trees{'spaces_in_node_names'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -790,7 +787,6 @@ 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[
 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1];
-$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 $result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'spaces_in_node_names'}{'contents'}[1];
 $result_trees{'spaces_in_node_names'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'spaces_in_node_names'}{'contents'}[1];
 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'spaces_in_node_names'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -908,8 +904,7 @@ $result_nodes{'spaces_in_node_names'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 6ff9b58acd..67fcd9de56 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
@@ -152,7 +152,6 @@ $result_trees{'table_in_display_in_example'} = {
                   ],
                   'extra' => {
                     'command_as_argument' => {},
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -192,9 +191,6 @@ $result_trees{'table_in_display_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -232,9 +228,6 @@ $result_trees{'table_in_display_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -265,17 +258,14 @@ 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_in_display_in_example'}{'contents'}[0];
 $result_trees{'table_in_display_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'table_in_display_in_example'};
 
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 983c2a4ef0..613d37315a 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
@@ -152,7 +152,6 @@ $result_trees{'table_in_example_in_display'} = {
                   ],
                   'extra' => {
                     'command_as_argument' => {},
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -192,9 +191,6 @@ $result_trees{'table_in_example_in_display'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -232,9 +228,6 @@ $result_trees{'table_in_example_in_display'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -265,17 +258,14 @@ 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0];
-$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_in_example_in_display'}{'contents'}[0];
 $result_trees{'table_in_example_in_display'}{'contents'}[0]{'parent'} = 
$result_trees{'table_in_example_in_display'};
 
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index d55059ccc2..2d2c54a76a 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -388,7 +388,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -543,7 +542,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -735,7 +733,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -912,7 +909,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1089,7 +1085,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1281,7 +1276,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1420,7 +1414,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1633,7 +1626,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1788,7 +1780,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1980,7 +1971,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2157,7 +2147,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2334,7 +2323,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2526,7 +2514,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2665,7 +2652,6 @@ $result_trees{'test_deftypefnnewline'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2739,7 +2725,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[2]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -2763,7 +2748,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[3]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[4]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0];
@@ -2792,7 +2776,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[5]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[6]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0];
@@ -2819,7 +2802,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[7]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[8]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'args'}[0];
@@ -2846,7 +2828,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[9]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[10]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -2875,7 +2856,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[11]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[12]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'args'}[0];
@@ -2896,7 +2876,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[13]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[14]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[15]{'args'}[0];
@@ -2927,7 +2906,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[17]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[18]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'args'}[0];
@@ -2951,7 +2929,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[19]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[20]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'args'}[0];
@@ -2980,7 +2957,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[21]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[22]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'args'}[0];
@@ -3007,7 +2983,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[23]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[24]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'args'}[0];
@@ -3034,7 +3009,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[25]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[26]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'args'}[0];
@@ -3063,7 +3037,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[27]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[28]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'args'}[0];
@@ -3084,7 +3057,6 @@ 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[2]{'parent'}
 = $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29];
-$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'extra'}{'end_command'}
 = 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'contents'}[2];
 
$result_trees{'test_deftypefnnewline'}{'contents'}[4]{'contents'}[29]{'parent'} 
= $result_trees{'test_deftypefnnewline'}{'contents'}[4];
 $result_trees{'test_deftypefnnewline'}{'contents'}[4]{'parent'} = 
$result_trees{'test_deftypefnnewline'};
 
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 9c132b9933..2ecd16bbfc 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -381,7 +381,6 @@ $result_trees{'things_before_setfilename'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'node_content' => [
                   {}
                 ],
@@ -572,7 +571,6 @@ $result_trees{'things_before_setfilename'} = {
               ],
               'extra' => {
                 'caption' => {},
-                'end_command' => {},
                 'node_content' => [
                   {}
                 ],
@@ -722,9 +720,6 @@ $result_trees{'things_before_setfilename'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => 'things_before_setfilename.texi',
@@ -1230,7 +1225,6 @@ 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0];
@@ -1260,7 +1254,6 @@ 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[4];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[4]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[4];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0];
@@ -1282,7 +1275,6 @@ 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0];
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 b2f60258f3..476216a929 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
@@ -381,7 +381,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'node_content' => [
                   {}
                 ],
@@ -572,7 +571,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
               ],
               'extra' => {
                 'caption' => {},
-                'end_command' => {},
                 'node_content' => [
                   {}
                 ],
@@ -722,9 +720,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => 'things_before_setfilename_no_element.texi',
@@ -1076,7 +1071,6 @@ 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
@@ -1106,7 +1100,6 @@ 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[4];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[4]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'caption'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[2];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'contents'}[4];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'node_content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
@@ -1128,7 +1121,6 @@ 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'things_before_setfilename_no_element'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0];
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index 4ce0b65fbe..f7424655fe 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -70,9 +70,6 @@ $result_trees{'block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -147,7 +144,6 @@ $result_trees{'block_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -301,7 +297,6 @@ $result_trees{'block_commands'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -335,7 +330,6 @@ 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'pa
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[1];
-$result_trees{'block_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'block_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'block_commands'}{'contents'}[0];
 $result_trees{'block_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'block_commands'}{'contents'}[0];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -345,7 +339,6 @@ 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'pa
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[3];
-$result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'block_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'block_commands'}{'contents'}[0];
 $result_trees{'block_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'block_commands'}{'contents'}[0];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0];
@@ -369,7 +362,6 @@ 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'ar
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[5];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'parent'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'caption'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
-$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[5];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
 $result_trees{'block_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'block_commands'}{'contents'}[0];
diff --git a/tp/t/results/coverage/cartouche.pl 
b/tp/t/results/coverage/cartouche.pl
index 1213b59136..5b4a6f8733 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -60,9 +60,6 @@ $result_trees{'cartouche'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -83,7 +80,6 @@ 
$result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'
 
$result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'cartouche'}{'contents'}[0]{'contents'}[0];
-$result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'cartouche'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'cartouche'}{'contents'}[0];
 $result_trees{'cartouche'}{'contents'}[0]{'parent'} = 
$result_trees{'cartouche'};
 
diff --git a/tp/t/results/coverage/cartouche_in_example.pl 
b/tp/t/results/coverage/cartouche_in_example.pl
index ab9a11ddc0..735ccad353 100644
--- a/tp/t/results/coverage/cartouche_in_example.pl
+++ b/tp/t/results/coverage/cartouche_in_example.pl
@@ -89,9 +89,6 @@ $result_trees{'cartouche_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -140,9 +137,6 @@ $result_trees{'cartouche_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -166,14 +160,12 @@ 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'cartouche_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'cartouche_in_example'}{'contents'}[0];
 $result_trees{'cartouche_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'cartouche_in_example'};
 
diff --git a/tp/t/results/coverage/cartouche_in_quotation.pl 
b/tp/t/results/coverage/cartouche_in_quotation.pl
index 36a700fcda..fe542cc435 100644
--- a/tp/t/results/coverage/cartouche_in_quotation.pl
+++ b/tp/t/results/coverage/cartouche_in_quotation.pl
@@ -89,9 +89,6 @@ $result_trees{'cartouche_in_quotation'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -140,9 +137,6 @@ $result_trees{'cartouche_in_quotation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -166,14 +160,12 @@ 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0];
-$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'cartouche_in_quotation'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'cartouche_in_quotation'}{'contents'}[0];
 $result_trees{'cartouche_in_quotation'}{'contents'}[0]{'parent'} = 
$result_trees{'cartouche_in_quotation'};
 
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index 62382586f8..58f1dab4d5 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -188,9 +188,6 @@ $result_trees{'commands_in_math'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1100,9 +1097,6 @@ $result_trees{'commands_in_math'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1952,9 +1946,6 @@ $result_trees{'commands_in_math'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2373,9 +2364,6 @@ $result_trees{'commands_in_math'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2415,7 +2403,6 @@ 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[12]{
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'args'}[0];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[13];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[13]{'parent'}
 = $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1];
-$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1]{'contents'}[13];
 $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'commands_in_math'}{'contents'}[0];
 $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'commands_in_math'}{'contents'}[0];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3];
@@ -2559,7 +2546,6 @@ 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'contents'}[78]{
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'contents'}[79]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'contents'}[79]{'args'}[0];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'contents'}[79]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'contents'}[79];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'contents'}[79]{'parent'}
 = $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3];
-$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'contents'}[79];
 $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'commands_in_math'}{'contents'}[0];
 $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'commands_in_math'}{'contents'}[0];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5];
@@ -2678,7 +2664,6 @@ 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'contents'}[73]{
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'contents'}[74]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'contents'}[74]{'args'}[0];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'contents'}[74]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'contents'}[74];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'contents'}[74]{'parent'}
 = $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5];
-$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'contents'}[74];
 $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'commands_in_math'}{'contents'}[0];
 $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'commands_in_math'}{'contents'}[0];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7];
@@ -2736,7 +2721,6 @@ 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'contents'}[33]{
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'contents'}[34]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'contents'}[34]{'args'}[0];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'contents'}[34]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'contents'}[34];
 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'contents'}[34]{'parent'}
 = $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7];
-$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'contents'}[34];
 $result_trees{'commands_in_math'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'commands_in_math'}{'contents'}[0];
 $result_trees{'commands_in_math'}{'contents'}[0]{'parent'} = 
$result_trees{'commands_in_math'};
 
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index 6805e21b15..b541e083c2 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -81,7 +81,6 @@ $result_trees{'comment_on_cartouche_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -106,7 +105,6 @@ 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_cartouche_line'}{'contents'}[0];
 $result_trees{'comment_on_cartouche_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_on_cartouche_line'};
 
diff --git a/tp/t/results/coverage/comment_on_group_line.pl 
b/tp/t/results/coverage/comment_on_group_line.pl
index f22af47e32..b0515cd1b3 100644
--- a/tp/t/results/coverage/comment_on_group_line.pl
+++ b/tp/t/results/coverage/comment_on_group_line.pl
@@ -81,7 +81,6 @@ $result_trees{'comment_on_group_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -106,7 +105,6 @@ 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'comment_on_group_line'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'comment_on_group_line'}{'contents'}[0];
 $result_trees{'comment_on_group_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_on_group_line'};
 
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 98dde298a2..8883287c47 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -163,7 +163,6 @@ $result_trees{'def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -406,7 +405,6 @@ $result_trees{'def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1937,7 +1935,6 @@ $result_trees{'def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1975,7 +1972,6 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} = $r
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1];
-$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 $result_trees{'def'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'def'}{'contents'}[0];
 $result_trees{'def'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'def'}{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -2009,7 +2005,6 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'} = $r
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
 $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3];
-$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
 $result_trees{'def'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'def'}{'contents'}[0];
 $result_trees{'def'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'def'}{'contents'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'args'}[0];
@@ -2220,7 +2215,6 @@ 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[15]{'parent'} = $
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[16]{'args'}[0];
 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[16]{'args'}[0]{'parent'}
 = $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[16];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[16]{'parent'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5];
-$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'} = 
$result_trees{'def'}{'contents'}[0]{'contents'}[5]{'contents'}[16];
 $result_trees{'def'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'def'}{'contents'}[0];
 $result_trees{'def'}{'contents'}[0]{'parent'} = $result_trees{'def'};
 
diff --git a/tp/t/results/coverage/displaymath.pl 
b/tp/t/results/coverage/displaymath.pl
index 76dce2662e..bce0236e5b 100644
--- a/tp/t/results/coverage/displaymath.pl
+++ b/tp/t/results/coverage/displaymath.pl
@@ -107,9 +107,6 @@ $result_trees{'displaymath'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -265,9 +262,6 @@ $result_trees{'displaymath'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -450,9 +444,6 @@ $result_trees{'displaymath'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -544,9 +535,6 @@ $result_trees{'displaymath'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -574,7 +562,6 @@ 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'paren
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'contents'}[5];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[1];
-$result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'contents'}[5];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[3];
@@ -597,7 +584,6 @@ 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'contents'}[5]{'paren
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'contents'}[6]{'args'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'contents'}[6];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[4];
-$result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'contents'}[6];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[6];
@@ -623,7 +609,6 @@ 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[7]{'contents'}[7]{'paren
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[7]{'contents'}[8]{'args'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[7]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[7]{'contents'}[8];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[7]{'contents'}[8]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[7];
-$result_trees{'displaymath'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[7]{'contents'}[8];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[9];
@@ -635,7 +620,6 @@ 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'pare
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[10]{'contents'}[2];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[10];
-$result_trees{'displaymath'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[10]{'contents'}[2];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 $result_trees{'displaymath'}{'contents'}[0]{'parent'} = 
$result_trees{'displaymath'};
 
diff --git a/tp/t/results/coverage/exdent_and_commands.pl 
b/tp/t/results/coverage/exdent_and_commands.pl
index 9db7f5d265..8df0e5c198 100644
--- a/tp/t/results/coverage/exdent_and_commands.pl
+++ b/tp/t/results/coverage/exdent_and_commands.pl
@@ -159,9 +159,6 @@ $result_trees{'exdent_and_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -325,9 +322,6 @@ $result_trees{'exdent_and_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -363,7 +357,6 @@ 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[4
 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'exdent_and_commands'}{'contents'}[0];
 $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'exdent_and_commands'}{'contents'}[0];
 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2];
@@ -387,7 +380,6 @@ 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[4
 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0];
 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
 $result_trees{'exdent_and_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'exdent_and_commands'}{'contents'}[0];
 $result_trees{'exdent_and_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'exdent_and_commands'};
 
diff --git a/tp/t/results/coverage/exdent_and_formats.pl 
b/tp/t/results/coverage/exdent_and_formats.pl
index b0f03702ef..cb0f0013db 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -146,9 +146,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -290,9 +287,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -383,9 +377,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -510,9 +501,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -598,9 +586,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -722,9 +707,6 @@ $result_trees{'exdent_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -762,9 +744,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -850,9 +829,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -949,9 +925,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1048,9 +1021,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1164,9 +1134,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1280,9 +1247,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1379,9 +1343,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1495,9 +1456,6 @@ $result_trees{'exdent_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1531,7 +1489,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[2]
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
@@ -1549,7 +1506,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'contents'}[3]
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'contents'}[4];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'contents'}[4];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[5];
@@ -1562,7 +1518,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'contents'}[0]
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[9];
@@ -1581,7 +1536,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15]{'contents'}[0
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[15]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[16]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17];
@@ -1593,7 +1547,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'contents'}[2
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'contents'}[3]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'contents'}[3];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'contents'}[3]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'contents'}[3];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[17]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[18]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19];
@@ -1608,12 +1561,10 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[2];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[2];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[2];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[2]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'contents'}[2];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[19]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[20]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21];
@@ -1623,7 +1574,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'contents'}[0
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'contents'}[1];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'contents'}[1];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[21]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[22]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23];
@@ -1635,7 +1585,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'contents'}[1
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'contents'}[2]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'contents'}[2];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'contents'}[2]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'contents'}[2];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[23]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[24]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25];
@@ -1647,7 +1596,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'contents'}[1
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'contents'}[2]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'contents'}[2];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'contents'}[2]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'contents'}[2];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[25]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[26]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27];
@@ -1660,7 +1608,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'contents'}[1
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'contents'}[2]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'contents'}[2];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'contents'}[2]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'contents'}[2];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[27]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[28]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29];
@@ -1673,7 +1620,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'contents'}[1
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'contents'}[2]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'contents'}[2];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'contents'}[2]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'contents'}[2];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[29]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[30]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31];
@@ -1685,7 +1631,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'contents'}[1
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'contents'}[2]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'contents'}[2];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'contents'}[2]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'contents'}[2];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[31]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[32]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33];
@@ -1698,7 +1643,6 @@ 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'contents'}[1
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'contents'}[2]{'args'}[0];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'contents'}[2];
 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'contents'}[2]{'parent'}
 = $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33];
-$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'extra'}{'end_command'}
 = 
$result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'contents'}[2];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'contents'}[33]{'parent'} = 
$result_trees{'exdent_and_formats'}{'contents'}[0];
 $result_trees{'exdent_and_formats'}{'contents'}[0]{'parent'} = 
$result_trees{'exdent_and_formats'};
 
diff --git a/tp/t/results/coverage/flushleft_flushright.pl 
b/tp/t/results/coverage/flushleft_flushright.pl
index 84adf76ac2..1e5c205164 100644
--- a/tp/t/results/coverage/flushleft_flushright.pl
+++ b/tp/t/results/coverage/flushleft_flushright.pl
@@ -97,9 +97,6 @@ $result_trees{'flushleft_flushright'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -195,9 +192,6 @@ $result_trees{'flushleft_flushright'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -224,7 +218,6 @@ 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1]{'contents'}[
 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1];
-$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 $result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'flushleft_flushright'}{'contents'}[0];
 $result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'flushleft_flushright'}{'contents'}[0];
 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3];
@@ -238,7 +231,6 @@ 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'contents'}[
 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3];
-$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
 $result_trees{'flushleft_flushright'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'flushleft_flushright'}{'contents'}[0];
 $result_trees{'flushleft_flushright'}{'contents'}[0]{'parent'} = 
$result_trees{'flushleft_flushright'};
 
diff --git a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl 
b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
index e1a510b673..c2cd71a2d7 100644
--- a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
+++ b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
@@ -89,9 +89,6 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -165,9 +162,6 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -205,9 +199,6 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -231,7 +222,6 @@ 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
@@ -241,12 +231,10 @@ 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1];
-$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0];
 $result_trees{'flushleft_flushright_in_quotation'}{'contents'}[0]{'parent'} = 
$result_trees{'flushleft_flushright_in_quotation'};
 
diff --git a/tp/t/results/coverage/flushright_example_nested.pl 
b/tp/t/results/coverage/flushright_example_nested.pl
index d2f9770d49..e00f0cb4ce 100644
--- a/tp/t/results/coverage/flushright_example_nested.pl
+++ b/tp/t/results/coverage/flushright_example_nested.pl
@@ -84,9 +84,6 @@ $result_trees{'flushright_example_nested'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -124,9 +121,6 @@ $result_trees{'flushright_example_nested'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -220,9 +214,6 @@ $result_trees{'flushright_example_nested'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -260,9 +251,6 @@ $result_trees{'flushright_example_nested'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -285,12 +273,10 @@ 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'flushright_example_nested'}{'contents'}[0];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'flushright_example_nested'}{'contents'}[0];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2];
@@ -302,12 +288,10 @@ 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'conten
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2];
-$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'flushright_example_nested'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'flushright_example_nested'}{'contents'}[0];
 $result_trees{'flushright_example_nested'}{'contents'}[0]{'parent'} = 
$result_trees{'flushright_example_nested'};
 
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl 
b/tp/t/results/coverage/formats_only_title_comments.pl
index 20fa54ab23..7a84367323 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -96,8 +96,7 @@ $result_trees{'formats_only_title_comments'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -208,7 +207,6 @@ $result_trees{'formats_only_title_comments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -318,7 +316,6 @@ $result_trees{'formats_only_title_comments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -426,7 +423,6 @@ $result_trees{'formats_only_title_comments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -552,7 +548,6 @@ $result_trees{'formats_only_title_comments'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -581,7 +576,6 @@ 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'extra'}{'comment_at_end'};
@@ -595,7 +589,6 @@ 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'cont
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -609,7 +602,6 @@ 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'cont
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
@@ -623,7 +615,6 @@ 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'cont
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -639,7 +630,6 @@ 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'cont
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'formats_only_title_comments'}{'contents'}[0];
 $result_trees{'formats_only_title_comments'}{'contents'}[0]{'parent'} = 
$result_trees{'formats_only_title_comments'};
 
diff --git a/tp/t/results/coverage/formats_only_titles.pl 
b/tp/t/results/coverage/formats_only_titles.pl
index 1417e663e8..d1fb943269 100644
--- a/tp/t/results/coverage/formats_only_titles.pl
+++ b/tp/t/results/coverage/formats_only_titles.pl
@@ -78,8 +78,7 @@ $result_trees{'formats_only_titles'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -156,7 +155,6 @@ $result_trees{'formats_only_titles'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -247,7 +245,6 @@ $result_trees{'formats_only_titles'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -338,7 +335,6 @@ $result_trees{'formats_only_titles'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -446,7 +442,6 @@ $result_trees{'formats_only_titles'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -473,7 +468,6 @@ 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[1
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2];
@@ -483,7 +477,6 @@ 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[0
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -495,7 +488,6 @@ 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[1
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0];
@@ -507,7 +499,6 @@ 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -521,7 +512,6 @@ 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[1
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'formats_only_titles'}{'contents'}[0];
 $result_trees{'formats_only_titles'}{'contents'}[0]{'parent'} = 
$result_trees{'formats_only_titles'};
 
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index 15bd025835..12c2d44285 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -104,8 +104,7 @@ $result_trees{'formats_titles'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -208,7 +207,6 @@ $result_trees{'formats_titles'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -339,7 +337,6 @@ $result_trees{'formats_titles'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -481,7 +478,6 @@ $result_trees{'formats_titles'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -655,7 +651,6 @@ $result_trees{'formats_titles'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -685,7 +680,6 @@ 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'ar
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2];
@@ -698,7 +692,6 @@ 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'pa
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -715,7 +708,6 @@ 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'ar
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0];
@@ -735,7 +727,6 @@ 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'ar
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -757,7 +748,6 @@ 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'ar
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
 = 
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'formats_titles'}{'contents'}[0];
 $result_trees{'formats_titles'}{'contents'}[0]{'parent'} = 
$result_trees{'formats_titles'};
 
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 df8f7d95cc..209e93fce1 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,7 +55,6 @@ $result_trees{'group_beginning_and_end_on_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -77,7 +76,6 @@ 
$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'
 
$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'group_beginning_and_end_on_line'}{'contents'}[0];
 $result_trees{'group_beginning_and_end_on_line'}{'contents'}[0]{'parent'} = 
$result_trees{'group_beginning_and_end_on_line'};
 
diff --git a/tp/t/results/coverage/indentedblock.pl 
b/tp/t/results/coverage/indentedblock.pl
index 56c5ec6093..e33fba0d72 100644
--- a/tp/t/results/coverage/indentedblock.pl
+++ b/tp/t/results/coverage/indentedblock.pl
@@ -86,9 +86,6 @@ $result_trees{'indentedblock'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -113,7 +110,6 @@ 
$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'par
 
$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0];
-$result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 $result_trees{'indentedblock'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'indentedblock'}{'contents'}[0];
 $result_trees{'indentedblock'}{'contents'}[0]{'parent'} = 
$result_trees{'indentedblock'};
 
diff --git a/tp/t/results/coverage/insertcopying.pl 
b/tp/t/results/coverage/insertcopying.pl
index 3d263affde..ad21567c04 100644
--- a/tp/t/results/coverage/insertcopying.pl
+++ b/tp/t/results/coverage/insertcopying.pl
@@ -95,9 +95,6 @@ $result_trees{'insertcopying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -135,9 +132,6 @@ $result_trees{'insertcopying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -202,12 +196,10 @@ 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'con
 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0];
-$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'insertcopying'}{'contents'}[0];
 $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'insertcopying'}{'contents'}[0];
 
$result_trees{'insertcopying'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'insertcopying'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/coverage/item_container.pl 
b/tp/t/results/coverage/item_container.pl
index f583756e25..1ae280ce92 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -91,7 +91,6 @@ $result_trees{'item_container'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -204,7 +203,6 @@ $result_trees{'item_container'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -298,8 +296,7 @@ $result_trees{'item_container'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -324,7 +321,6 @@ 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'pa
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[1];
-$result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'item_container'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'item_container'}{'contents'}[0];
 $result_trees{'item_container'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'item_container'}{'contents'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -339,7 +335,6 @@ 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'ar
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'item_container'}{'contents'}[0];
 $result_trees{'item_container'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'item_container'}{'contents'}[0];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0];
@@ -351,7 +346,6 @@ 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'ar
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 $result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'item_container'}{'contents'}[0];
 $result_trees{'item_container'}{'contents'}[0]{'parent'} = 
$result_trees{'item_container'};
 
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index 51dfcced88..9a1154f78d 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -375,7 +375,6 @@ $result_trees{'multitable'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -528,7 +527,6 @@ $result_trees{'multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -612,7 +610,6 @@ 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'columnfractions'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 $result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'multitable'}{'contents'}[0];
 $result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'multitable'}{'contents'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -632,7 +629,6 @@ 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[3];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/coverage/nested_block_commands.pl 
b/tp/t/results/coverage/nested_block_commands.pl
index 11ff2dcdf6..73ba8c50d5 100644
--- a/tp/t/results/coverage/nested_block_commands.pl
+++ b/tp/t/results/coverage/nested_block_commands.pl
@@ -89,9 +89,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -129,9 +126,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -214,9 +208,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -254,9 +245,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -350,9 +338,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -401,9 +386,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -503,9 +485,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -543,9 +522,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -651,9 +627,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -691,9 +664,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -793,9 +763,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -833,9 +800,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -924,9 +888,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -964,9 +925,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1061,9 +1019,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1101,9 +1056,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1192,9 +1144,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1232,9 +1181,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1317,9 +1263,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1374,9 +1317,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1459,9 +1399,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1516,9 +1453,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1601,9 +1535,6 @@ $result_trees{'nested_block_commands'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1664,9 +1595,6 @@ $result_trees{'nested_block_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1690,12 +1618,10 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2];
@@ -1705,12 +1631,10 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4];
@@ -1722,14 +1646,12 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[5]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6];
@@ -1742,12 +1664,10 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[3];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[6]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[7]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8];
@@ -1761,12 +1681,10 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[4];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[4]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[4];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[8]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[9]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10];
@@ -1779,12 +1697,10 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[3]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[10]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[11]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12];
@@ -1795,12 +1711,10 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[12]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[13]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14];
@@ -1812,12 +1726,10 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[14]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[15]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16];
@@ -1828,12 +1740,10 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[16]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[17]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18];
@@ -1843,7 +1753,6 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[2];
@@ -1851,7 +1760,6 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[3]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[18]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[19]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20];
@@ -1861,7 +1769,6 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20];
@@ -1869,7 +1776,6 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[3]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[3];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[20]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[21]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22];
@@ -1879,7 +1785,6 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[2];
@@ -1888,7 +1793,6 @@ 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[4]{'args'}[0];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[4];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[4]{'parent'}
 = $result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22];
-$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'extra'}{'end_command'}
 = 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[4];
 
$result_trees{'nested_block_commands'}{'contents'}[0]{'contents'}[22]{'parent'} 
= $result_trees{'nested_block_commands'}{'contents'}[0];
 $result_trees{'nested_block_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_block_commands'};
 
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index 725067900c..c78519c818 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -81,9 +81,6 @@ $result_trees{'preformatted'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -243,7 +240,6 @@ $result_trees{'preformatted'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -283,9 +279,6 @@ $result_trees{'preformatted'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -309,7 +302,6 @@ 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'pare
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[1];
-$result_trees{'preformatted'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'preformatted'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'preformatted'}{'contents'}[0];
 $result_trees{'preformatted'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'preformatted'}{'contents'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3];
@@ -331,12 +323,10 @@ 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'cont
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3];
-$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'preformatted'}{'contents'}[0];
 $result_trees{'preformatted'}{'contents'}[0]{'parent'} = 
$result_trees{'preformatted'};
 
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index d778041e42..a88e38fb8a 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -184,7 +184,6 @@ $result_trees{'punctuation_in_line_commands'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -289,7 +288,6 @@ $result_trees{'punctuation_in_line_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -413,7 +411,6 @@ $result_trees{'punctuation_in_line_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -550,7 +547,6 @@ $result_trees{'punctuation_in_line_commands'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -860,7 +856,6 @@ 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'con
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -873,7 +868,6 @@ 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'con
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[0];
@@ -891,7 +885,6 @@ 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'con
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
@@ -914,7 +907,6 @@ 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'con
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[1];
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'contents'}[3];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/coverage/quotation_author.pl 
b/tp/t/results/coverage/quotation_author.pl
index 815013b793..4c4f225302 100644
--- a/tp/t/results/coverage/quotation_author.pl
+++ b/tp/t/results/coverage/quotation_author.pl
@@ -169,8 +169,7 @@ $result_trees{'quotation_author'} = {
             'authors' => [
               {},
               {}
-            ],
-            'end_command' => {}
+            ]
           },
           'parent' => {},
           'source_info' => {
@@ -209,7 +208,6 @@ 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'
 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'extra'}{'authors'}[1]
 = 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 $result_trees{'quotation_author'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'quotation_author'}{'contents'}[0];
 $result_trees{'quotation_author'}{'contents'}[0]{'parent'} = 
$result_trees{'quotation_author'};
 
diff --git a/tp/t/results/coverage/raggedright.pl 
b/tp/t/results/coverage/raggedright.pl
index 308f56d92f..b832377ab4 100644
--- a/tp/t/results/coverage/raggedright.pl
+++ b/tp/t/results/coverage/raggedright.pl
@@ -70,9 +70,6 @@ $result_trees{'raggedright'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -94,7 +91,6 @@ 
$result_trees{'raggedright'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'paren
 
$result_trees{'raggedright'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raggedright'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raggedright'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raggedright'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raggedright'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raggedright'}{'contents'}[0]{'contents'}[1];
-$result_trees{'raggedright'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'raggedright'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'raggedright'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'raggedright'}{'contents'}[0];
 $result_trees{'raggedright'}{'contents'}[0]{'parent'} = 
$result_trees{'raggedright'};
 
diff --git a/tp/t/results/coverage/symbol_after_block.pl 
b/tp/t/results/coverage/symbol_after_block.pl
index 7b768a42ac..2327f5586b 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -64,9 +64,6 @@ $result_trees{'symbol_after_block'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -143,9 +140,6 @@ $result_trees{'symbol_after_block'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -398,7 +392,6 @@ $result_trees{'symbol_after_block'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -533,7 +526,6 @@ $result_trees{'symbol_after_block'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -650,7 +642,6 @@ $result_trees{'symbol_after_block'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -754,7 +745,6 @@ $result_trees{'symbol_after_block'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -994,7 +984,6 @@ $result_trees{'symbol_after_block'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -1222,7 +1211,6 @@ $result_trees{'symbol_after_block'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -1311,9 +1299,6 @@ $result_trees{'symbol_after_block'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1386,9 +1371,6 @@ $result_trees{'symbol_after_block'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1474,9 +1456,6 @@ $result_trees{'symbol_after_block'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1549,9 +1528,6 @@ $result_trees{'symbol_after_block'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1572,7 +1548,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'contents'}[0]
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2];
@@ -1583,7 +1558,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'contents'}[1]
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[4];
@@ -1621,7 +1595,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'contents'}[1
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[15]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'args'}[0];
@@ -1639,7 +1612,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'contents'}[1
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'extra'}{'command_as_argument'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[16]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[17]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[18];
@@ -1654,7 +1626,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'contents'}[1
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[21]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'args'}[0];
@@ -1667,7 +1638,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'contents'}[1
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[22]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[23]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[24];
@@ -1697,7 +1667,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'contents'}[2
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'contents'}[2];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'contents'}[2]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'extra'}{'columnfractions'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'contents'}[2];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[27]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -1725,7 +1694,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'contents'}[2
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'contents'}[2];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'contents'}[2]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'extra'}{'columnfractions'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'contents'}[2];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[28]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[29]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[30];
@@ -1737,7 +1705,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32]{'contents'}[0
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[32]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[33]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'args'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34];
@@ -1747,7 +1714,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'contents'}[1
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[34]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[35]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[36];
@@ -1759,7 +1725,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38]{'contents'}[0
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[38]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[39]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'args'}[0]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40];
@@ -1769,7 +1734,6 @@ 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'contents'}[1
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'args'}[0];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'contents'}[1];
 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'parent'}
 = $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'contents'}[1];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[40]{'parent'} = 
$result_trees{'symbol_after_block'}{'contents'}[0];
 $result_trees{'symbol_after_block'}{'contents'}[0]{'parent'} = 
$result_trees{'symbol_after_block'};
 
diff --git a/tp/t/results/coverage/symbol_after_command.pl 
b/tp/t/results/coverage/symbol_after_command.pl
index 22f88e59b3..05dcd4404d 100644
--- a/tp/t/results/coverage/symbol_after_command.pl
+++ b/tp/t/results/coverage/symbol_after_command.pl
@@ -342,7 +342,6 @@ $result_trees{'symbol_after_command'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -489,7 +488,6 @@ 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
 $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'symbol_after_command'}{'contents'}[0];
 $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'symbol_after_command'}{'contents'}[0];
 
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index e5d428976b..24765947f3 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -164,7 +164,6 @@ $result_trees{'table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -507,7 +506,6 @@ $result_trees{'table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -621,7 +619,6 @@ $result_trees{'table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -657,7 +654,6 @@ 
$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'
 
$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'table'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'table'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} = 
$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'table'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'table'}{'contents'}[0];
 $result_trees{'table'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'table'}{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -705,7 +701,6 @@ 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
 $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'} 
= $result_trees{'table'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
 $result_trees{'table'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'table'}{'contents'}[0];
 $result_trees{'table'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'table'}{'contents'}[0];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[0]{'contents'}[5]{'args'}[0];
@@ -719,7 +714,6 @@ 
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'
 
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'table'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 $result_trees{'table'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'} 
= $result_trees{'table'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'} = 
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 $result_trees{'table'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'table'}{'contents'}[0];
 $result_trees{'table'}{'contents'}[0]{'parent'} = $result_trees{'table'};
 
diff --git a/tp/t/results/coverage/table_command_comment.pl 
b/tp/t/results/coverage/table_command_comment.pl
index dbec0ac212..8ce02d8c43 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -119,7 +119,6 @@ $result_trees{'table_command_comment'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -149,7 +148,6 @@ 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'table_command_comment'}{'contents'}[0];
 $result_trees{'table_command_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'table_command_comment'};
 
diff --git a/tp/t/results/coverage_braces/caption_not_closed.pl 
b/tp/t/results/coverage_braces/caption_not_closed.pl
index 1e67143c6e..fac2d21ae1 100644
--- a/tp/t/results/coverage_braces/caption_not_closed.pl
+++ b/tp/t/results/coverage_braces/caption_not_closed.pl
@@ -142,7 +142,6 @@ $result_trees{'caption_not_closed'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -204,7 +203,6 @@ 
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]
 
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'caption'}
 = 
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'caption_not_closed'}{'contents'}[0];
 $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'caption_not_closed'}{'contents'}[0];
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 01ccfbba0d..4338ce46a9 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
@@ -74,9 +74,6 @@ $result_trees{'format_on_first_footnote_line'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -178,9 +175,6 @@ $result_trees{'format_on_first_footnote_line'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -231,7 +225,6 @@ 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[0];
@@ -245,7 +238,6 @@ 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'co
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'format_on_first_footnote_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
diff --git a/tp/t/results/coverage_braces/kbd.pl 
b/tp/t/results/coverage_braces/kbd.pl
index bc165aec4a..efb4f79d30 100644
--- a/tp/t/results/coverage_braces/kbd.pl
+++ b/tp/t/results/coverage_braces/kbd.pl
@@ -289,9 +289,6 @@ $result_trees{'kbd'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -412,9 +409,6 @@ $result_trees{'kbd'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -471,7 +465,6 @@ 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'} = $r
 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'kbd'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'kbd'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 $result_trees{'kbd'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[8];
-$result_trees{'kbd'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'} = 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 $result_trees{'kbd'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'kbd'}{'contents'}[0];
 $result_trees{'kbd'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'kbd'}{'contents'}[0];
 $result_trees{'kbd'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'} = 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[10];
@@ -489,7 +482,6 @@ 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'} = $
 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'kbd'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 $result_trees{'kbd'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'} = 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[12];
-$result_trees{'kbd'}{'contents'}[0]{'contents'}[12]{'extra'}{'end_command'} = 
$result_trees{'kbd'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 $result_trees{'kbd'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'kbd'}{'contents'}[0];
 $result_trees{'kbd'}{'contents'}[0]{'parent'} = $result_trees{'kbd'};
 
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 52f98ee77b..b89d33bea6 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -639,9 +639,6 @@ $result_trees{'test_image'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1804,9 +1801,6 @@ $result_trees{'test_image'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2949,7 +2943,6 @@ $result_trees{'test_image'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -3145,7 +3138,6 @@ 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3];
-$result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
 $result_trees{'test_image'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'test_image'}{'contents'}[0];
 $result_trees{'test_image'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'test_image'}{'contents'}[0];
 $result_trees{'test_image'}{'contents'}[0]{'parent'} = 
$result_trees{'test_image'};
@@ -3342,7 +3334,6 @@ 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'parent
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'extra'}{'end_command'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'contents'}[1];
 $result_trees{'test_image'}{'contents'}[1]{'contents'}[9]{'parent'} = 
$result_trees{'test_image'}{'contents'}[1];
 $result_trees{'test_image'}{'contents'}[1]{'contents'}[10]{'parent'} = 
$result_trees{'test_image'}{'contents'}[1];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'args'}[0];
@@ -3538,7 +3529,6 @@ 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[7]{'args'
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[7];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[7]{'parent'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11];
 $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'extra'}{'caption'} 
= $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[5];
-$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'}
 = $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'contents'}[7];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[0];
 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0];
 $result_trees{'test_image'}{'contents'}[1]{'contents'}[11]{'parent'} = 
$result_trees{'test_image'}{'contents'}[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 b6e564c1eb..788d754267 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -317,9 +317,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -602,7 +599,6 @@ 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5];
-$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'parent'} 
= $result_trees{'two_footnotes_in_nodes'}{'contents'}[2];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[6]{'parent'} 
= $result_trees{'two_footnotes_in_nodes'}{'contents'}[2];
 $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'two_footnotes_in_nodes'};
@@ -744,8 +740,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 5e4c157fda..0c64af42a7 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
@@ -349,9 +349,6 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -637,7 +634,6 @@ 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'
 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5];
-$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2];
 
$result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2];
 $result_trees{'two_footnotes_in_nodes_separate'}{'contents'}[2]{'parent'} = 
$result_trees{'two_footnotes_in_nodes_separate'};
@@ -780,8 +776,7 @@ $result_nodes{'two_footnotes_in_nodes_separate'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 11f337f879..475f6fbc11 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -131,7 +131,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -284,7 +283,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -422,7 +420,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -591,7 +588,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -745,7 +741,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -936,7 +931,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1112,7 +1106,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1266,7 +1259,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1420,7 +1412,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1589,7 +1580,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1765,7 +1755,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1956,7 +1945,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2131,7 +2119,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2291,7 +2278,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2444,7 +2430,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2603,7 +2588,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2762,7 +2746,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2921,7 +2904,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3065,7 +3047,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3239,7 +3220,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3383,7 +3363,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3558,7 +3537,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3718,7 +3696,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3884,7 +3861,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4066,7 +4042,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4247,7 +4222,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4444,7 +4418,6 @@ $result_trees{'all_commands'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4478,7 +4451,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'pare
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
@@ -4500,7 +4472,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'pare
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
@@ -4520,7 +4491,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'pare
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
@@ -4545,7 +4515,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'pare
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[6];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0];
@@ -4568,7 +4537,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'pare
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[8];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0];
@@ -4596,7 +4564,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[10];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0];
@@ -4622,7 +4589,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[12];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[13]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0];
@@ -4645,7 +4611,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[14];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[14]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[15]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0];
@@ -4668,7 +4633,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[16];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[16]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[17]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0];
@@ -4693,7 +4657,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[18];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[18]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[19]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0];
@@ -4719,7 +4682,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[20];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[20]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[21]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0];
@@ -4747,7 +4709,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[22];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[22]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[23]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0];
@@ -4772,7 +4733,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[24];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[24]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[25]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0];
@@ -4795,7 +4755,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[26];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[26]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[27]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0];
@@ -4817,7 +4776,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[28]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[29]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -4840,7 +4798,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[30]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[31]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -4863,7 +4820,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[32]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[33]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -4886,7 +4842,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[34]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[35]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -4907,7 +4862,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[36]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[37]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -4932,7 +4886,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[38]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[39]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -4953,7 +4906,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[40]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[41]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -4979,7 +4931,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[42];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[42]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[43]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5003,7 +4954,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[44];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[44]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[45]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5027,7 +4977,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[46];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[46]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[47]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5054,7 +5003,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[48];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[48]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[49]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5080,7 +5028,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[50];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[50]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[51]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5109,7 +5056,6 @@ 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'par
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[2];
 
$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[52];
-$result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'extra'}{'end_command'}
 = $result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'contents'}[2];
 $result_trees{'all_commands'}{'contents'}[0]{'contents'}[52]{'parent'} = 
$result_trees{'all_commands'}{'contents'}[0];
 $result_trees{'all_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'all_commands'};
 
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index 689de876ff..94563eb61a 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -487,7 +487,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -930,7 +929,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1198,7 +1196,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1768,7 +1765,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1942,7 +1938,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2295,7 +2290,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2713,7 +2707,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3145,7 +3138,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3563,7 +3555,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4021,7 +4012,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4434,7 +4424,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4881,7 +4870,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5088,7 +5076,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5317,7 +5304,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5546,7 +5532,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5753,7 +5738,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5960,7 +5944,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -6189,7 +6172,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -6418,7 +6400,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -6625,7 +6606,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -6832,7 +6812,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7061,7 +7040,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7290,7 +7268,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7497,7 +7474,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7704,7 +7680,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7952,7 +7927,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8124,7 +8098,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8347,7 +8320,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8570,7 +8542,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8793,7 +8764,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -9016,7 +8986,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -9273,7 +9242,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -9530,7 +9498,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -9787,7 +9754,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10044,7 +10010,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10267,7 +10232,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10490,7 +10454,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10747,7 +10710,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11003,7 +10965,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11300,7 +11261,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11597,7 +11557,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11860,7 +11819,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -12123,7 +12081,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -12420,7 +12377,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -12717,7 +12673,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -13019,7 +12974,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -13321,7 +13275,6 @@ $result_trees{'all_commands_delimiters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -13398,7 +13351,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
@@ -13455,7 +13407,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13491,7 +13442,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13565,7 +13515,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13589,7 +13538,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0];
@@ -13637,7 +13585,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13692,7 +13639,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13748,7 +13694,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13803,7 +13748,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13863,7 +13807,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'args'}[0];
@@ -13917,7 +13860,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[20]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[21]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0];
@@ -13976,7 +13918,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[22]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[23]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'args'}[0];
@@ -14005,7 +13946,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[24]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[25]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'args'}[0];
@@ -14036,7 +13976,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[26]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[27]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'args'}[0];
@@ -14067,7 +14006,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[28]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[29]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'args'}[0];
@@ -14096,7 +14034,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[30]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[31]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'args'}[0];
@@ -14125,7 +14062,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[32]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[33]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0];
@@ -14156,7 +14092,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[34]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[35]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[0]{'args'}[0];
@@ -14187,7 +14122,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[36]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[37]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'args'}[0];
@@ -14216,7 +14150,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[38]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[39]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[0]{'args'}[0];
@@ -14245,7 +14178,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[40]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[41]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'args'}[0];
@@ -14276,7 +14208,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[42]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[43]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[0]{'args'}[0];
@@ -14307,7 +14238,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[44]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[45]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[0]{'args'}[0];
@@ -14336,7 +14266,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[46]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[47]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[0]{'args'}[0];
@@ -14365,7 +14294,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[48]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[49]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -14400,7 +14328,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[50]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[51]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -14424,7 +14351,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[52]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[53]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14453,7 +14379,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[54]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[55]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14482,7 +14407,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[56]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[57]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14511,7 +14435,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[58]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[59]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14540,7 +14463,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[60]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[61]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14574,7 +14496,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[62]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[63]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14608,7 +14529,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[64]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[65]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14642,7 +14562,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[66]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[67]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14676,7 +14595,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[68]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[69]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14705,7 +14623,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[70]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[71]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14734,7 +14651,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[72]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[73]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14768,7 +14684,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[74]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[75]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14801,7 +14716,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[76]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[77]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14840,7 +14754,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[78]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[79]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14879,7 +14792,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[80]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[81]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14913,7 +14825,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[82]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[83]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14947,7 +14858,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[84]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[85]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14986,7 +14896,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[86]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[87]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15025,7 +14934,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[88]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[89]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -15064,7 +14972,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[90]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[91]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -15103,7 +15010,6 @@ 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'content
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92];
-$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'contents'}[1];
 
$result_trees{'all_commands_delimiters'}{'contents'}[0]{'contents'}[92]{'parent'}
 = $result_trees{'all_commands_delimiters'}{'contents'}[0];
 $result_trees{'all_commands_delimiters'}{'contents'}[0]{'parent'} = 
$result_trees{'all_commands_delimiters'};
 
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 750b6f9c81..c40b69c2a7 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -510,7 +510,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -954,7 +953,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1223,7 +1221,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1794,7 +1791,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1969,7 +1965,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2323,7 +2318,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2742,7 +2736,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3175,7 +3168,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3594,7 +3586,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4053,7 +4044,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4467,7 +4457,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4915,7 +4904,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5123,7 +5111,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5353,7 +5340,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5583,7 +5569,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5791,7 +5776,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -5999,7 +5983,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -6229,7 +6212,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -6459,7 +6441,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -6667,7 +6648,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -6875,7 +6855,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7105,7 +7084,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7335,7 +7313,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7543,7 +7520,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -7751,7 +7727,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8000,7 +7975,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8173,7 +8147,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8397,7 +8370,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8621,7 +8593,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -8845,7 +8816,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -9069,7 +9039,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -9327,7 +9296,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -9585,7 +9553,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -9843,7 +9810,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10101,7 +10067,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10325,7 +10290,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10549,7 +10513,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -10807,7 +10770,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11064,7 +11026,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11362,7 +11323,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11660,7 +11620,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -11924,7 +11883,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -12188,7 +12146,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -12486,7 +12443,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -12784,7 +12740,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -13087,7 +13042,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -13390,7 +13344,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -13686,7 +13639,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
@@ -13744,7 +13696,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13781,7 +13732,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13856,7 +13806,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13881,7 +13830,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[9]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0];
@@ -13930,7 +13878,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[10]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -13986,7 +13933,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[12]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[13]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -14043,7 +13989,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[14]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[15]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -14099,7 +14044,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[16]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[17]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -14160,7 +14104,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[1
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[18]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[19]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0];
@@ -14215,7 +14158,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[20]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[21]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0];
@@ -14275,7 +14217,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[22]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[23]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0];
@@ -14305,7 +14246,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[24]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[25]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0];
@@ -14337,7 +14277,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[26]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[27]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0];
@@ -14369,7 +14308,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[2
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[28]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[29]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0];
@@ -14399,7 +14337,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[30]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[31]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0];
@@ -14429,7 +14366,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[32]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[33]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0];
@@ -14461,7 +14397,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[34]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[35]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0];
@@ -14493,7 +14428,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[36]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[37]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0];
@@ -14523,7 +14457,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[3
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[38]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[39]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0];
@@ -14553,7 +14486,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[40]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[41]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0];
@@ -14585,7 +14517,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[42]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[43]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0];
@@ -14617,7 +14548,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[44]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[45]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
@@ -14647,7 +14577,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[46]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[47]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0];
@@ -14677,7 +14606,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[4
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[48]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[49]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -14713,7 +14641,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[50]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[51]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -14738,7 +14665,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[52]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[53]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14768,7 +14694,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[54]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[55]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14798,7 +14723,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[56]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[57]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14828,7 +14752,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[5
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[58]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[59]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14858,7 +14781,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[60]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[61]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14893,7 +14815,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[62]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[63]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14928,7 +14849,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[64]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[65]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14963,7 +14883,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[66]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[67]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -14998,7 +14917,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[6
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[68]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[69]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15028,7 +14946,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[70]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[71]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15058,7 +14975,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[72]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[73]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15093,7 +15009,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[74]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[75]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15127,7 +15042,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[76]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[77]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15167,7 +15081,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[7
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[78]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[79]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15207,7 +15120,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[80]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[81]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15242,7 +15154,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[82]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[83]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15277,7 +15188,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[84]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[85]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15317,7 +15227,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[86]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[87]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -15357,7 +15266,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[8
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[88]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[89]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -15397,7 +15305,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[9
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[90]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[91]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -15437,7 +15344,6 @@ 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[9
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92];
-$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[92]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[93]{'parent'}
 = $result_trees{'all_commands_delimiters_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[94]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_delimiters_printindex'}{'contents'}[1]{'contents'}[94]{'args'}[0];
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 44ea68a06b..4d732741d4 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -154,7 +154,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -308,7 +307,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -447,7 +445,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -617,7 +614,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -772,7 +768,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -964,7 +959,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1141,7 +1135,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1296,7 +1289,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1451,7 +1443,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1621,7 +1612,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1798,7 +1788,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1990,7 +1979,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2166,7 +2154,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2327,7 +2314,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2481,7 +2467,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2641,7 +2626,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2801,7 +2785,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2961,7 +2944,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3106,7 +3088,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3281,7 +3262,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3426,7 +3406,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3602,7 +3581,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3763,7 +3741,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3930,7 +3907,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4113,7 +4089,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4295,7 +4270,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4493,7 +4467,6 @@ $result_trees{'all_commands_printindex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4746,7 +4719,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'args'}[0];
@@ -4769,7 +4741,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'args'}[0];
@@ -4790,7 +4761,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0];
@@ -4816,7 +4786,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'args'}[0];
@@ -4840,7 +4809,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[9]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[0]{'args'}[0];
@@ -4869,7 +4837,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[10]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[0]{'args'}[0];
@@ -4896,7 +4863,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[12]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[13]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[0]{'args'}[0];
@@ -4920,7 +4886,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[14]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[15]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'args'}[0];
@@ -4944,7 +4909,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[16]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[17]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[0]{'args'}[0];
@@ -4970,7 +4934,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[18]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[19]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[0]{'args'}[0];
@@ -4997,7 +4960,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[20]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[21]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[0]{'args'}[0];
@@ -5026,7 +4988,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[22]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[23]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[0]{'args'}[0];
@@ -5052,7 +5013,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[24]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[25]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[0]{'args'}[0];
@@ -5076,7 +5036,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[26]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[27]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[0]{'args'}[0];
@@ -5099,7 +5058,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[28]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[29]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5123,7 +5081,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[30]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[31]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5147,7 +5104,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[32]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[33]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5171,7 +5127,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[34]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[35]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5193,7 +5148,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[36]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[37]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5219,7 +5173,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[38]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[39]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5241,7 +5194,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[40]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[41]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5268,7 +5220,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[42]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[43]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5293,7 +5244,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[44]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[45]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5318,7 +5268,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[46]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[47]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5346,7 +5295,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[48]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[49]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5373,7 +5321,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[50]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[51]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -5403,7 +5350,6 @@ 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'content
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[2]{'args'}[0];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[2]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52];
-$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'extra'}{'end_command'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'contents'}[2];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[52]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[53]{'parent'}
 = $result_trees{'all_commands_printindex'}{'contents'}[1];
 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[54]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_commands_printindex'}{'contents'}[1]{'contents'}[54]{'args'}[0];
diff --git a/tp/t/results/def/all_empty_def.pl 
b/tp/t/results/def/all_empty_def.pl
index 6e19ddbca1..24504d38d7 100644
--- a/tp/t/results/def/all_empty_def.pl
+++ b/tp/t/results/def/all_empty_def.pl
@@ -63,7 +63,6 @@ $result_trees{'all_empty_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -134,7 +133,6 @@ $result_trees{'all_empty_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -205,7 +203,6 @@ $result_trees{'all_empty_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -276,7 +273,6 @@ $result_trees{'all_empty_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -347,7 +343,6 @@ $result_trees{'all_empty_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -418,7 +413,6 @@ $result_trees{'all_empty_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -489,7 +483,6 @@ $result_trees{'all_empty_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -560,7 +553,6 @@ $result_trees{'all_empty_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -631,7 +623,6 @@ $result_trees{'all_empty_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -654,7 +645,6 @@ 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'par
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
@@ -662,7 +652,6 @@ 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'par
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
@@ -670,7 +659,6 @@ 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'par
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
@@ -678,7 +666,6 @@ 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'par
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
@@ -686,7 +673,6 @@ 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'par
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
@@ -694,7 +680,6 @@ 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'pa
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
@@ -702,7 +687,6 @@ 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'pa
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'extra'}{'end_command'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[13]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[0];
@@ -710,7 +694,6 @@ 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'pa
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[14]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[15]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[0];
@@ -718,7 +701,6 @@ 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[0]{'pa
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'parent'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16];
-$result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'extra'}{'end_command'}
 = $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 $result_trees{'all_empty_def'}{'contents'}[0]{'contents'}[16]{'parent'} = 
$result_trees{'all_empty_def'}{'contents'}[0];
 $result_trees{'all_empty_def'}{'contents'}[0]{'parent'} = 
$result_trees{'all_empty_def'};
 
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index aeb77a9234..de61b21de2 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -200,7 +200,6 @@ $result_trees{'ampchar'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -306,7 +305,6 @@ 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'ampchar'}{'contents'}[0]{'contents'}[0];
-$result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'} 
= $result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'ampchar'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'ampchar'}{'contents'}[0];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} 
= $result_trees{'ampchar'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'ampchar'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'ampchar'}{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index 1b48a5d74d..b30fdc58d4 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -241,7 +241,6 @@ $result_trees{'code_in_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -291,7 +290,6 @@ 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'paren
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0];
-$result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'code_in_def'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'code_in_def'}{'contents'}[0];
 $result_trees{'code_in_def'}{'contents'}[0]{'parent'} = 
$result_trees{'code_in_def'};
 
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index dee4fdc07b..c0e1ae1857 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -392,7 +392,6 @@ $result_trees{'def_defx_mismatch'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -460,7 +459,6 @@ 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0];
-$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'def_defx_mismatch'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'def_defx_mismatch'}{'contents'}[0];
 $result_trees{'def_defx_mismatch'}{'contents'}[0]{'parent'} = 
$result_trees{'def_defx_mismatch'};
 
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index ea42a0247c..a4dfac5f4d 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -281,7 +281,6 @@ $result_trees{'defx_after_comment'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -335,7 +334,6 @@ 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'defx_after_comment'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'defx_after_comment'}{'contents'}[0];
 $result_trees{'defx_after_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'defx_after_comment'};
 
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 fb1bbb226f..c127ab3343 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -305,7 +305,6 @@ $result_trees{'defx_after_comment_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -345,9 +344,6 @@ $result_trees{'defx_after_comment_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -401,12 +397,10 @@ 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_after_comment_in_example'}{'contents'}[0];
 $result_trees{'defx_after_comment_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'defx_after_comment_in_example'};
 
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index 27a562a43a..baf1a7df6d 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -269,7 +269,6 @@ $result_trees{'defx_after_empty_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -322,7 +321,6 @@ 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'defx_after_empty_line'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'defx_after_empty_line'}{'contents'}[0];
 $result_trees{'defx_after_empty_line'}{'contents'}[0]{'parent'} = 
$result_trees{'defx_after_empty_line'};
 
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 bfd645a1ef..2ef1f5e0d0 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
@@ -335,7 +335,6 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -375,9 +374,6 @@ $result_trees{'defx_after_empty_line_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -435,12 +431,10 @@ 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0];
 $result_trees{'defx_after_empty_line_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'defx_after_empty_line_in_example'};
 
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index d2732794c0..c4ec3707a8 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -281,7 +281,6 @@ $result_trees{'defx_after_paragraph_end'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -336,7 +335,6 @@ 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_after_paragraph_end'}{'contents'}[0];
 $result_trees{'defx_after_paragraph_end'}{'contents'}[0]{'parent'} = 
$result_trees{'defx_after_paragraph_end'};
 
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 31051d2003..9c2b63aa26 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -299,7 +299,6 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -339,9 +338,6 @@ $result_trees{'defx_after_preformatted_with_text'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -395,12 +391,10 @@ 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0];
 $result_trees{'defx_after_preformatted_with_text'}{'contents'}[0]{'parent'} = 
$result_trees{'defx_after_preformatted_with_text'};
 
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index aec0ac5021..87f7bd902a 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -275,7 +275,6 @@ $result_trees{'defx_after_text'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -329,7 +328,6 @@ 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'p
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'defx_after_text'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'defx_after_text'}{'contents'}[0];
 $result_trees{'defx_after_text'}{'contents'}[0]{'parent'} = 
$result_trees{'defx_after_text'};
 
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index 60315621d2..3a3b7d943a 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -275,7 +275,6 @@ $result_trees{'defx_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -315,9 +314,6 @@ $result_trees{'defx_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -367,12 +363,10 @@ 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'defx_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'defx_in_example'}{'contents'}[0];
 $result_trees{'defx_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'defx_in_example'};
 
diff --git a/tp/t/results/def/double_command.pl 
b/tp/t/results/def/double_command.pl
index 81609fe1fb..1911825b56 100644
--- a/tp/t/results/def/double_command.pl
+++ b/tp/t/results/def/double_command.pl
@@ -428,7 +428,6 @@ $result_trees{'double_command'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -666,7 +665,6 @@ $result_trees{'double_command'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -740,7 +738,6 @@ 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'pa
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'double_command'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'double_command'}{'contents'}[0];
 $result_trees{'double_command'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'double_command'}{'contents'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
@@ -774,7 +771,6 @@ 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'pa
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[2];
-$result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'double_command'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'double_command'}{'contents'}[0];
 $result_trees{'double_command'}{'contents'}[0]{'parent'} = 
$result_trees{'double_command'};
 
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index 824018be47..6cfb5de6d4 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -626,7 +626,6 @@ $result_trees{'empty_def_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -717,7 +716,6 @@ 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[8
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[9];
 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[9];
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_def_arguments'}{'contents'}[0];
 $result_trees{'empty_def_arguments'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_def_arguments'};
 
diff --git a/tp/t/results/def/empty_def_command.pl 
b/tp/t/results/def/empty_def_command.pl
index 22317de60f..9720e30ca3 100644
--- a/tp/t/results/def/empty_def_command.pl
+++ b/tp/t/results/def/empty_def_command.pl
@@ -114,7 +114,6 @@ $result_trees{'empty_def_command'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -338,7 +337,6 @@ $result_trees{'empty_def_command'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -369,7 +367,6 @@ 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_def_command'}{'contents'}[0];
 $result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'empty_def_command'}{'contents'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
@@ -401,7 +398,6 @@ 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'empty_def_command'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'empty_def_command'}{'contents'}[0];
 $result_trees{'empty_def_command'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_def_command'};
 
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index dbda77dae9..aa224836a8 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -220,7 +220,6 @@ $result_trees{'empty_deftype'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -425,7 +424,6 @@ $result_trees{'empty_deftype'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -674,7 +672,6 @@ $result_trees{'empty_deftype'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -901,7 +898,6 @@ $result_trees{'empty_deftype'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -947,7 +943,6 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'par
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_deftype'}{'contents'}[0];
 $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'empty_deftype'}{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -976,7 +971,6 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'par
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'empty_deftype'}{'contents'}[0];
 $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'empty_deftype'}{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -1011,7 +1005,6 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'par
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'empty_deftype'}{'contents'}[0];
 $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'empty_deftype'}{'contents'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -1043,7 +1036,6 @@ 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'par
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
 
$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6];
-$result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
 $result_trees{'empty_deftype'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'empty_deftype'}{'contents'}[0];
 $result_trees{'empty_deftype'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_deftype'};
 
diff --git a/tp/t/results/def/empty_deftypeop_name.pl 
b/tp/t/results/def/empty_deftypeop_name.pl
index 65739839e1..56a4e2372c 100644
--- a/tp/t/results/def/empty_deftypeop_name.pl
+++ b/tp/t/results/def/empty_deftypeop_name.pl
@@ -204,7 +204,6 @@ $result_trees{'empty_deftypeop_name'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -247,7 +246,6 @@ 
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'empty_deftypeop_name'}{'contents'}[0];
 $result_trees{'empty_deftypeop_name'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_deftypeop_name'};
 
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index 7fa389ea0a..8387ca3ae2 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -273,7 +273,6 @@ $result_trees{'end_of_lines_protected'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -325,7 +324,6 @@ 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0];
-$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'end_of_lines_protected'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'end_of_lines_protected'}{'contents'}[0];
 $result_trees{'end_of_lines_protected'}{'contents'}[0]{'parent'} = 
$result_trees{'end_of_lines_protected'};
 
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 7ac210bd2d..5e95ddee91 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
@@ -294,7 +294,6 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                         }
                       ],
                       'extra' => {
-                        'end_command' => {},
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -375,7 +374,6 @@ 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_lines_protected_in_footnote'}{'contents'}[0]{'contents'}[0];
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 5d6b003de8..cfc57d249f 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -539,7 +539,6 @@ $result_trees{'inter_item_commands_in_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -630,7 +629,6 @@ 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'conte
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_def'}{'contents'}[0];
 $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'parent'} = 
$result_trees{'inter_item_commands_in_def'};
 
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 3157a845a7..68857c1521 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
@@ -565,7 +565,6 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -605,9 +604,6 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -699,12 +695,10 @@ 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0];
 
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'parent'} 
= $result_trees{'inter_item_commands_in_def_in_example'};
 
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 4c2dcabd30..c70fa718ad 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -141,7 +141,6 @@ $result_trees{'leading_space_in_def_arg'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -175,7 +174,6 @@ 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0];
-$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'leading_space_in_def_arg'}{'contents'}[0];
 $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'parent'} = 
$result_trees{'leading_space_in_def_arg'};
 
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 60aefe05a5..95fe20d2b2 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -80,7 +80,6 @@ $result_trees{'no_category_or_no_name'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '
 '
           },
@@ -199,7 +198,6 @@ $result_trees{'no_category_or_no_name'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -432,7 +430,6 @@ $result_trees{'no_category_or_no_name'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -457,7 +454,6 @@ 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0];
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'no_category_or_no_name'}{'contents'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'no_category_or_no_name'}{'contents'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -472,7 +468,6 @@ 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2];
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'no_category_or_no_name'}{'contents'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'no_category_or_no_name'}{'contents'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
@@ -503,7 +498,6 @@ 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[4];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4];
-$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'contents'}[4];
 
$result_trees{'no_category_or_no_name'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'no_category_or_no_name'}{'contents'}[0];
 $result_trees{'no_category_or_no_name'}{'contents'}[0]{'parent'} = 
$result_trees{'no_category_or_no_name'};
 
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 016ebe0a3d..7d2a4b5c9c 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -411,7 +411,6 @@ $result_trees{'omit_def_space'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -504,7 +503,6 @@ 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'pa
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3];
-$result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 $result_trees{'omit_def_space'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'omit_def_space'}{'contents'}[2];
 $result_trees{'omit_def_space'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'contents'}[0];
 
$result_trees{'omit_def_space'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'omit_def_space'}{'contents'}[2]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/def/protected_brace.pl 
b/tp/t/results/def/protected_brace.pl
index c5a1141592..6ce76de9a3 100644
--- a/tp/t/results/def/protected_brace.pl
+++ b/tp/t/results/def/protected_brace.pl
@@ -114,7 +114,6 @@ $result_trees{'protected_brace'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -145,7 +144,6 @@ 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'p
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0];
-$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'protected_brace'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'protected_brace'}{'contents'}[0];
 $result_trees{'protected_brace'}{'contents'}[0]{'parent'} = 
$result_trees{'protected_brace'};
 
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 527de82937..4774c684a9 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -634,7 +634,6 @@ $result_trees{'ref_in_def'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -775,7 +774,6 @@ 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1];
-$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'ref_in_def'}{'contents'}[1];
 $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'ref_in_def'}{'contents'}[1];
 $result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[3] = 
$result_trees{'ref_in_def'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'label'};
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 8dbfb34420..0eb7134c60 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -323,7 +323,6 @@ $result_trees{'space_in_def_for_index'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -439,7 +438,6 @@ 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'space_in_def_for_index'}{'contents'}[1];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'space_in_def_for_index'}{'contents'}[1];
 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[3]{'args'}[0];
diff --git a/tp/t/results/def/wrong_braces_simple.pl 
b/tp/t/results/def/wrong_braces_simple.pl
index 65c176cb26..c0365a727d 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -159,7 +159,6 @@ $result_trees{'wrong_braces_simple'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -340,7 +339,6 @@ $result_trees{'wrong_braces_simple'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -520,7 +518,6 @@ $result_trees{'wrong_braces_simple'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -706,7 +703,6 @@ $result_trees{'wrong_braces_simple'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1393,7 +1389,6 @@ $result_trees{'wrong_braces_simple'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1430,7 +1425,6 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'wrong_braces_simple'}{'contents'}[0];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'wrong_braces_simple'}{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
@@ -1455,7 +1449,6 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[0
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'wrong_braces_simple'}{'contents'}[0];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'wrong_braces_simple'}{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
@@ -1479,7 +1472,6 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[0
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'wrong_braces_simple'}{'contents'}[0];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'wrong_braces_simple'}{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
@@ -1504,7 +1496,6 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[0
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'wrong_braces_simple'}{'contents'}[0];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'wrong_braces_simple'}{'contents'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0];
@@ -1600,7 +1591,6 @@ 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[4
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5];
 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'parent'}
 = $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8];
-$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'contents'}[5];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'wrong_braces_simple'}{'contents'}[0];
 $result_trees{'wrong_braces_simple'}{'contents'}[0]{'parent'} = 
$result_trees{'wrong_braces_simple'};
 
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 21a0c19c3e..f5c5126d3f 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
@@ -174,7 +174,6 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -365,7 +364,6 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -405,7 +403,6 @@ 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
@@ -433,7 +430,6 @@ 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'c
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0];
 $result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'parent'} = 
$result_trees{'wrong_braces_with_end_of_lines'};
 
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 37f8a10143..5ea4bc55ea 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
@@ -59,7 +59,6 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -130,9 +129,6 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -152,7 +148,6 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0];
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0];
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2];
@@ -161,7 +156,6 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0];
 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'}{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation_with_arg_followed_by_quotation'};
 
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index cb2b9696be..966d22c214 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -367,9 +367,6 @@ $result_trees{'special_docbook_unnumbered'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -823,7 +820,6 @@ 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'conte
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0];
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3];
-$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'special_docbook_unnumbered'}{'contents'}[2];
 
$result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'special_docbook_unnumbered'}{'contents'}[2];
 $result_trees{'special_docbook_unnumbered'}{'contents'}[2]{'parent'} = 
$result_trees{'special_docbook_unnumbered'};
@@ -1068,8 +1064,7 @@ $result_nodes{'special_docbook_unnumbered'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index ab4b65f5f2..09b2b19c01 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -220,7 +220,6 @@ $result_trees{'anchor_in_caption'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -296,7 +295,6 @@ 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{
 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'anchor_in_caption'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'anchor_in_caption'}{'contents'}[1];
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 1a382016c2..b0234fd6fc 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -234,7 +234,6 @@ $result_trees{'cindex_in_caption'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -357,7 +356,6 @@ 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'cindex_in_caption'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'cindex_in_caption'}{'contents'}[1];
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 0127fb2efa..0a0fda5c93 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -139,7 +139,6 @@ $result_trees{'comment_space_comand_in_float'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {},
               {}
@@ -266,7 +265,6 @@ 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'co
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'comment_space_comand_in_float'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index 3827fc8aa1..1ded1985a7 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -247,9 +247,6 @@ $result_trees{'complex_float'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -539,7 +536,6 @@ $result_trees{'complex_float'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -655,7 +651,6 @@ $result_trees{'complex_float'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -1135,9 +1130,6 @@ $result_trees{'complex_float'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -1317,7 +1309,6 @@ $result_trees{'complex_float'} = {
                       ],
                       'extra' => {
                         'command_as_argument' => {},
-                        'end_command' => {},
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -1540,7 +1531,6 @@ $result_trees{'complex_float'} = {
                         }
                       ],
                       'extra' => {
-                        'end_command' => {},
                         'max_columns' => 2,
                         'prototypes' => [
                           {
@@ -1723,7 +1713,6 @@ $result_trees{'complex_float'} = {
                       ],
                       'extra' => {
                         'command_as_argument' => {},
-                        'end_command' => {},
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -2454,7 +2443,6 @@ $result_trees{'complex_float'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -2708,9 +2696,6 @@ $result_trees{'complex_float'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -2850,7 +2835,6 @@ $result_trees{'complex_float'} = {
                       ],
                       'extra' => {
                         'command_as_argument' => {},
-                        'end_command' => {},
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -3073,7 +3057,6 @@ $result_trees{'complex_float'} = {
                         }
                       ],
                       'extra' => {
-                        'end_command' => {},
                         'max_columns' => 2,
                         'prototypes' => [
                           {
@@ -3256,7 +3239,6 @@ $result_trees{'complex_float'} = {
                       ],
                       'extra' => {
                         'command_as_argument' => {},
-                        'end_command' => {},
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -3735,7 +3717,6 @@ $result_trees{'complex_float'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -3857,7 +3838,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'par
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[5];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 $result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'complex_float'}{'contents'}[2];
 $result_trees{'complex_float'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'complex_float'}{'contents'}[2];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[0];
@@ -3899,7 +3879,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'con
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[7]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[9];
@@ -3914,7 +3893,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'co
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[10]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[12];
@@ -3986,7 +3964,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'ar
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[3]{'args'}[0];
@@ -4011,7 +3988,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'ar
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[9];
@@ -4040,7 +4016,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'ar
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[10]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
@@ -4066,7 +4041,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'ar
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[14]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[15]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[16]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[16];
@@ -4178,7 +4152,6 @@ 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[22]{'ar
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[22];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[22]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[22];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'complex_float'}{'contents'}[2];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'shortcaption'}
 = $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[19];
@@ -4214,7 +4187,6 @@ 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'arg
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3];
@@ -4233,7 +4205,6 @@ 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'arg
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6];
@@ -4262,7 +4233,6 @@ 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'arg
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
@@ -4288,7 +4258,6 @@ 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'arg
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[11]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[12]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[13]{'args'}[0];
@@ -4362,7 +4331,6 @@ 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'arg
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[6];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[6];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'complex_float'}{'contents'}[4];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -4613,8 +4581,7 @@ $result_nodes{'complex_float'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/float/empty_caption.pl 
b/tp/t/results/float/empty_caption.pl
index c1463038c8..1f6beab2f9 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -113,7 +113,6 @@ $result_trees{'empty_caption'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -232,7 +231,6 @@ $result_trees{'empty_caption'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -365,7 +363,6 @@ $result_trees{'empty_caption'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'shortcaption' => {},
             'type' => {
               'normalized' => ''
@@ -400,7 +397,6 @@ 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'arg
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'empty_caption'}{'contents'}[0];
@@ -417,7 +413,6 @@ 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'par
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3];
-$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'extra'}{'shortcaption'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'empty_caption'}{'contents'}[0];
@@ -437,7 +432,6 @@ 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'arg
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[5];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[5]{'parent'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'extra'}{'caption'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
-$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[5];
 
$result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'extra'}{'shortcaption'}
 = $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 $result_trees{'empty_caption'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'empty_caption'}{'contents'}[0];
 $result_trees{'empty_caption'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_caption'};
diff --git a/tp/t/results/float/empty_label_no_space.pl 
b/tp/t/results/float/empty_label_no_space.pl
index a348b4679f..971db9f54b 100644
--- a/tp/t/results/float/empty_label_no_space.pl
+++ b/tp/t/results/float/empty_label_no_space.pl
@@ -69,7 +69,6 @@ $result_trees{'empty_label_no_space'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -99,7 +98,6 @@ 
$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'
 
$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1];
-$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'empty_label_no_space'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'empty_label_no_space'}{'contents'}[0];
 $result_trees{'empty_label_no_space'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_label_no_space'};
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 7417451404..8c9169ac8c 100644
--- a/tp/t/results/float/empty_label_no_space_comment.pl
+++ b/tp/t/results/float/empty_label_no_space_comment.pl
@@ -85,7 +85,6 @@ $result_trees{'empty_label_no_space_comment'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -117,7 +116,6 @@ 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'arg
 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1];
-$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_label_no_space_comment'}{'contents'}[0];
 $result_trees{'empty_label_no_space_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_label_no_space_comment'};
diff --git a/tp/t/results/float/empty_label_with_space.pl 
b/tp/t/results/float/empty_label_with_space.pl
index 887645afa0..505bfaea08 100644
--- a/tp/t/results/float/empty_label_with_space.pl
+++ b/tp/t/results/float/empty_label_with_space.pl
@@ -69,7 +69,6 @@ $result_trees{'empty_label_with_space'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -99,7 +98,6 @@ 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'args'}[1]
 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1];
-$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_label_with_space'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'empty_label_with_space'}{'contents'}[0];
 $result_trees{'empty_label_with_space'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_label_with_space'};
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 f55feae7fc..514835be06 100644
--- a/tp/t/results/float/empty_label_with_space_comment.pl
+++ b/tp/t/results/float/empty_label_with_space_comment.pl
@@ -86,7 +86,6 @@ $result_trees{'empty_label_with_space_comment'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -118,7 +117,6 @@ 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'a
 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1];
-$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_label_with_space_comment'}{'contents'}[0];
 $result_trees{'empty_label_with_space_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_label_with_space_comment'};
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index 1adb8b93ed..be9889e9d2 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -93,7 +93,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -220,7 +219,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -299,7 +297,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'type' => {
               'normalized' => ''
             }
@@ -410,7 +407,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'type' => {
               'normalized' => ''
             }
@@ -471,7 +467,6 @@ 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'c
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[0];
@@ -490,7 +485,6 @@ 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'c
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'extra'}{'caption'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[0];
@@ -500,7 +494,6 @@ 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6]{'c
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6];
-$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8];
@@ -516,7 +509,6 @@ 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'c
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'extra'}{'caption'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
-$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'empty_listoffloats_with_floats'}{'contents'}[0];
 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_listoffloats_with_floats'}{'contents'}[0]{'contents'}[10];
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index eb6cec735e..fb90dba225 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -545,7 +545,6 @@ $result_trees{'float_copying'} = {
                   ],
                   'extra' => {
                     'caption' => {},
-                    'end_command' => {},
                     'node_content' => [
                       {}
                     ],
@@ -595,9 +594,6 @@ $result_trees{'float_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -809,9 +805,6 @@ $result_trees{'float_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1100,14 +1093,12 @@ 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[5];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[5];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0];
 $result_trees{'float_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[0];
@@ -1137,7 +1128,6 @@ 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'par
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'float_copying'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[2];
 $result_trees{'float_copying'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[2];
 $result_trees{'float_copying'}{'contents'}[2]{'parent'} = 
$result_trees{'float_copying'};
@@ -1284,8 +1274,7 @@ $result_nodes{'float_copying'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index 17f7e9aa78..d4ca0a28f1 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -317,7 +317,6 @@ $result_trees{'float_with_at_commands'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {},
               {},
@@ -471,7 +470,6 @@ 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[5];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[5];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[1]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[2]
 = 
$result_trees{'float_with_at_commands'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[2];
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index e7456debce..b8481bedeb 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -220,7 +220,6 @@ $result_trees{'footnote_in_caption'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -296,7 +295,6 @@ 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3
 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'footnote_in_caption'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'footnote_in_caption'}{'contents'}[1];
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 e5d53cec8d..7020451131 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -230,7 +230,6 @@ $result_trees{'footnote_in_caption_and_error'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -307,7 +306,6 @@ 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'co
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'contents'}[3];
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'footnote_in_caption_and_error'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'footnote_in_caption_and_error'}{'contents'}[1];
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index 8f2a8c5ba6..a49673be0d 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -259,7 +259,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -427,7 +426,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'shortcaption' => {},
             'spaces_before_argument' => ' ',
@@ -596,7 +594,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -699,7 +696,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -791,7 +787,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'float_section' => {},
             'type' => {
               'normalized' => ''
@@ -939,7 +934,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'shortcaption' => {},
             'type' => {
@@ -1104,7 +1098,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -1280,7 +1273,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -1637,9 +1629,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1845,7 +1834,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -1988,7 +1976,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -2286,7 +2273,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -2462,7 +2448,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -2638,7 +2623,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -2767,9 +2751,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2944,7 +2925,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -3149,9 +3129,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -3304,7 +3281,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -3471,7 +3447,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -3730,7 +3705,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -3936,9 +3910,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -4091,7 +4062,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -4341,7 +4311,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -4514,7 +4483,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -4767,7 +4735,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -5507,7 +5474,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
@@ -5535,7 +5501,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -5563,7 +5528,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[5]{'contents'}[4];
@@ -5579,7 +5543,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
@@ -5592,7 +5555,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[2]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[11]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[12]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
@@ -5615,7 +5577,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[5]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[13]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
@@ -5642,7 +5603,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[15]{'contents'}[4];
@@ -5671,7 +5631,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[17]{'contents'}[4];
@@ -5732,7 +5691,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[19]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'contents'}[20]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[2];
 $result_trees{'numbering_captions_listoffloats'}{'contents'}[2]{'parent'} = 
$result_trees{'numbering_captions_listoffloats'};
@@ -5761,7 +5719,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -5783,7 +5740,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -5830,7 +5786,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[4]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -5862,7 +5817,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[7]{'contents'}[4];
@@ -5891,7 +5845,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[9]{'contents'}[4];
@@ -5912,7 +5865,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[11]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'contents'}[12]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[4];
 $result_trees{'numbering_captions_listoffloats'}{'contents'}[4]{'parent'} = 
$result_trees{'numbering_captions_listoffloats'};
@@ -5935,7 +5887,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -5964,7 +5915,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
@@ -5988,7 +5938,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[5]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[2]{'contents'}[1];
@@ -6016,7 +5965,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[8];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[8]{'contents'}[3]{'contents'}[4];
@@ -6055,7 +6003,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[5]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[10];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[10]{'contents'}[2]{'contents'}[1];
@@ -6085,7 +6032,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
@@ -6109,7 +6055,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[5]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[12];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[12]{'contents'}[2]{'contents'}[1];
@@ -6147,7 +6092,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[3];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[5];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[1]{'contents'}[1];
@@ -6176,7 +6120,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[2];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[14];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[14]{'contents'}[3]{'contents'}[4];
@@ -6214,7 +6157,6 @@ 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[6]{'parent'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[4];
-$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[6];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'numbering_captions_listoffloats'}{'contents'}[16];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'extra'}{'shortcaption'}
 = 
$result_trees{'numbering_captions_listoffloats'}{'contents'}[16]{'contents'}[1]{'contents'}[2];
@@ -6906,8 +6848,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -6925,8 +6866,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -6958,8 +6898,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'Unnumbered'
@@ -6991,8 +6930,7 @@ $result_nodes{'numbering_captions_listoffloats'} = {
                 },
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'Chapter-with-unnumbsubsec'
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index 07930751a2..83d744e61b 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -86,7 +86,6 @@ $result_trees{'ref_to_float'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -179,7 +178,6 @@ $result_trees{'ref_to_float'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -309,7 +307,6 @@ 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'pare
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'ref_to_float'}{'contents'}[0];
@@ -322,7 +319,6 @@ 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'pare
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3];
-$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0];
 $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'ref_to_float'}{'contents'}[0];
 $result_trees{'ref_to_float'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'ref_to_float'}{'contents'}[0];
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index 9804f2c26f..b3df714310 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -125,7 +125,6 @@ $result_trees{'simple'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -170,7 +169,6 @@ 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{
 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
 $result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'} 
= $result_trees{'simple'}{'contents'}[0]{'contents'}[1];
 $result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'extra'}{'caption'} = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'} 
= $result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'contents'}[4];
 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'simple'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[0];
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 3650499f20..ad8c723851 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -4746,9 +4746,6 @@ $result_trees{'at_commands_in_refs'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -18307,7 +18304,6 @@ 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
-$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[27];
 $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'at_commands_in_refs'}{'contents'}[2];
 $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'at_commands_in_refs'}{'contents'}[2];
 $result_trees{'at_commands_in_refs'}{'contents'}[2]{'parent'} = 
$result_trees{'at_commands_in_refs'};
@@ -21668,8 +21664,7 @@ $result_nodes{'at_commands_in_refs'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 627ac5a1ec..1f82261655 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
@@ -4813,9 +4813,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -18381,7 +18378,6 @@ 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'conte
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[0];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1];
-$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'contents'}[27];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2];
 
$result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2];
 $result_trees{'at_commands_in_refs_latin1'}{'contents'}[2]{'parent'} = 
$result_trees{'at_commands_in_refs_latin1'};
@@ -21746,8 +21742,7 @@ $result_nodes{'at_commands_in_refs_latin1'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 18dfc9ea4e..e75972c143 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
@@ -4813,9 +4813,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -18381,7 +18378,6 @@ 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'content
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[0];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1];
-$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[27];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2];
 
$result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2];
 $result_trees{'at_commands_in_refs_utf8'}{'contents'}[2]{'parent'} = 
$result_trees{'at_commands_in_refs_utf8'};
@@ -21746,8 +21742,7 @@ $result_nodes{'at_commands_in_refs_utf8'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 fce4e569a4..cb2c2bc6cd 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
@@ -510,9 +510,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'char_latin1_latin1_in_refs.texi',
@@ -1495,7 +1492,6 @@ 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'conte
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1];
-$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2];
 
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2];
 $result_trees{'char_latin1_latin1_in_refs'}{'contents'}[2]{'parent'} = 
$result_trees{'char_latin1_latin1_in_refs'};
@@ -1869,8 +1865,7 @@ $result_nodes{'char_latin1_latin1_in_refs'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl 
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
index c2929ac7ff..f160d4ae11 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
@@ -548,9 +548,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'char_latin1_utf8_in_refs.texi',
@@ -1499,7 +1496,6 @@ 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'content
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'args'}[0];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3];
-$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'contents'}[5];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2];
 
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2];
 $result_trees{'char_latin1_utf8_in_refs'}{'contents'}[2]{'parent'} = 
$result_trees{'char_latin1_utf8_in_refs'};
@@ -1870,8 +1866,7 @@ $result_nodes{'char_latin1_utf8_in_refs'} = {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 0dfacbbd90..4b49a9d03d 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
@@ -420,9 +420,6 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'char_latin2_latin2_in_refs.texi',
@@ -599,7 +596,6 @@ 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'conte
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6];
-$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2];
 
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2];
 $result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'parent'} = 
$result_trees{'char_latin2_latin2_in_refs'};
@@ -722,8 +718,7 @@ $result_nodes{'char_latin2_latin2_in_refs'} = {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 ca274b765d..884f06f6f1 100644
--- a/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
+++ b/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
@@ -222,9 +222,6 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -268,7 +265,6 @@ 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}[4];
-$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0];
 $result_trees{'documentencoding_utf8_and_insertions'}{'contents'}[0]{'parent'} 
= $result_trees{'documentencoding_utf8_and_insertions'};
 
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index c6bb040c43..78c84f417b 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -401,9 +401,6 @@ $result_trees{'japanese_shift_jis'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'japanese_shift_jis.texi',
@@ -598,9 +595,6 @@ $result_trees{'japanese_shift_jis'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'japanese_shift_jis.texi',
@@ -885,7 +879,6 @@ 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1]{'contents'}[4]
 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1];
-$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 $result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'japanese_shift_jis'}{'contents'}[2];
 $result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'japanese_shift_jis'}{'contents'}[2];
 $result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'japanese_shift_jis'}{'contents'}[2];
@@ -916,7 +909,6 @@ 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[1]
 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[2];
 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6];
-$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'contents'}[2];
 $result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'japanese_shift_jis'}{'contents'}[2];
 $result_trees{'japanese_shift_jis'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'japanese_shift_jis'}{'contents'}[2];
 $result_trees{'japanese_shift_jis'}{'contents'}[2]{'parent'} = 
$result_trees{'japanese_shift_jis'};
@@ -1100,8 +1092,7 @@ $result_nodes{'japanese_shift_jis'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 968533369c..2468da5aa5 100644
--- a/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
+++ b/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
@@ -191,9 +191,6 @@ $result_trees{'no_documentencoding_and_insertions'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -234,7 +231,6 @@ 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3];
-$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'no_documentencoding_and_insertions'}{'contents'}[0];
 $result_trees{'no_documentencoding_and_insertions'}{'contents'}[0]{'parent'} = 
$result_trees{'no_documentencoding_and_insertions'};
 
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index b65736c3ca..5168bdbb64 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -236,9 +236,6 @@ $result_trees{'sample_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
@@ -382,9 +379,6 @@ $result_trees{'sample_utf8'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => 'sample_utf8.texi',
@@ -756,9 +750,6 @@ $result_trees{'sample_utf8'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'sample_utf8.texi',
@@ -1172,7 +1163,6 @@ $result_trees{'sample_utf8'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -1450,7 +1440,6 @@ 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'conte
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5];
-$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7];
@@ -1468,7 +1457,6 @@ 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'conte
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'contents'}[4];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7];
-$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'contents'}[4];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[0]{'contents'}[1]{'contents'}[9];
@@ -1524,7 +1512,6 @@ 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'paren
 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 
$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3];
-$result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 $result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[2];
 $result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[2];
 $result_trees{'sample_utf8'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[2];
@@ -1585,7 +1572,6 @@ 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'paren
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7];
-$result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[4];
 $result_trees{'sample_utf8'}{'contents'}[4]{'contents'}[8]{'parent'} = 
$result_trees{'sample_utf8'}{'contents'}[4];
 $result_trees{'sample_utf8'}{'contents'}[4]{'parent'} = 
$result_trees{'sample_utf8'};
@@ -1835,8 +1821,7 @@ $result_nodes{'sample_utf8'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index a2dca65c13..1e0cee0eaf 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -152,9 +152,6 @@ $result_trees{'cond'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'cond.texi',
@@ -270,9 +267,6 @@ $result_trees{'cond'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -360,7 +354,6 @@ 
$result_trees{'cond'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} = $
 
$result_trees{'cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'cond'}{'contents'}[1]{'contents'}[1];
-$result_trees{'cond'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} = 
$result_trees{'cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'cond'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'cond'}{'contents'}[1];
 $result_trees{'cond'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'cond'}{'contents'}[1];
 $result_trees{'cond'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'cond'}{'contents'}[1]{'contents'}[3];
@@ -378,7 +371,6 @@ 
$result_trees{'cond'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'parent'} =
 
$result_trees{'cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 $result_trees{'cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'parent'} 
= $result_trees{'cond'}{'contents'}[1]{'contents'}[11];
-$result_trees{'cond'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'} = 
$result_trees{'cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 $result_trees{'cond'}{'contents'}[1]{'contents'}[11]{'parent'} = 
$result_trees{'cond'}{'contents'}[1];
 $result_trees{'cond'}{'contents'}[1]{'contents'}[12]{'parent'} = 
$result_trees{'cond'}{'contents'}[1];
 $result_trees{'cond'}{'contents'}[1]{'contents'}[13]{'parent'} = 
$result_trees{'cond'}{'contents'}[1];
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 9f1c130bf4..e271ab762b 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -152,9 +152,6 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'cond.texi',
@@ -281,9 +278,6 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'cond.texi',
@@ -376,7 +370,6 @@ 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'content
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1];
-$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[3];
@@ -395,7 +388,6 @@ 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'conten
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11];
-$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[12]{'parent'}
 = $result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1];
 
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[13]{'contents'}[0]{'parent'}
 = $result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[13];
diff --git a/tp/t/results/formatting/cond_info.pl 
b/tp/t/results/formatting/cond_info.pl
index d5b229a351..0f0af4d72b 100644
--- a/tp/t/results/formatting/cond_info.pl
+++ b/tp/t/results/formatting/cond_info.pl
@@ -141,9 +141,6 @@ $result_trees{'cond_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -254,9 +251,6 @@ $result_trees{'cond_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -343,7 +337,6 @@ 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'
 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'cond_info'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'cond_info'}{'contents'}[1]{'contents'}[1];
-$result_trees{'cond_info'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'cond_info'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 $result_trees{'cond_info'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'cond_info'}{'contents'}[1];
 $result_trees{'cond_info'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'cond_info'}{'contents'}[1];
 $result_trees{'cond_info'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'cond_info'}{'contents'}[1];
@@ -361,7 +354,6 @@ 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'parent
 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'cond_info'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 
$result_trees{'cond_info'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'cond_info'}{'contents'}[1]{'contents'}[11];
-$result_trees{'cond_info'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'}
 = $result_trees{'cond_info'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 $result_trees{'cond_info'}{'contents'}[1]{'contents'}[11]{'parent'} = 
$result_trees{'cond_info'}{'contents'}[1];
 $result_trees{'cond_info'}{'contents'}[1]{'contents'}[12]{'parent'} = 
$result_trees{'cond_info'}{'contents'}[1];
 $result_trees{'cond_info'}{'contents'}[1]{'contents'}[13]{'parent'} = 
$result_trees{'cond_info'}{'contents'}[1];
diff --git a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
index 93b4de24a6..f20f0042ae 100644
--- a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
@@ -152,9 +152,6 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'cond.texi',
@@ -281,9 +278,6 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'cond.texi',
@@ -376,7 +370,6 @@ 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'co
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1];
-$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[3];
@@ -395,7 +388,6 @@ 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'c
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'parent'}
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11];
-$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[1];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[12]{'parent'}
 = $result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1];
 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[13]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'contents'}[13];
diff --git a/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index 48d7ff7d24..235febc237 100644
--- a/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -141,9 +141,6 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -254,9 +251,6 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -343,7 +337,6 @@ 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1];
-$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
@@ -361,7 +354,6 @@ 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'parent'}
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11];
-$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[12]{'parent'}
 = $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
 
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[13]{'parent'}
 = $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
diff --git a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl 
b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index 2ae2740222..6ac2cf29e5 100644
--- a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -141,9 +141,6 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -254,9 +251,6 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -343,7 +337,6 @@ 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1];
-$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
@@ -361,7 +354,6 @@ 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'parent'}
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11];
-$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[12]{'parent'}
 = $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
 
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'contents'}[13]{'parent'}
 = $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1];
diff --git a/tp/t/results/formatting/cond_xml.pl 
b/tp/t/results/formatting/cond_xml.pl
index 76697dc3df..3edf9506e4 100644
--- a/tp/t/results/formatting/cond_xml.pl
+++ b/tp/t/results/formatting/cond_xml.pl
@@ -141,9 +141,6 @@ $result_trees{'cond_xml'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -254,9 +251,6 @@ $result_trees{'cond_xml'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -343,7 +337,6 @@ 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1];
-$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'cond_xml'}{'contents'}[1];
 $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'cond_xml'}{'contents'}[1];
 $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'cond_xml'}{'contents'}[1];
@@ -361,7 +354,6 @@ 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'parent'
 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 
$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11];
-$result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'}
 = $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[11]{'parent'} = 
$result_trees{'cond_xml'}{'contents'}[1];
 $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[12]{'parent'} = 
$result_trees{'cond_xml'}{'contents'}[1];
 $result_trees{'cond_xml'}{'contents'}[1]{'contents'}[13]{'parent'} = 
$result_trees{'cond_xml'}{'contents'}[1];
diff --git a/tp/t/results/formatting/defcondx_Dbar.pl 
b/tp/t/results/formatting/defcondx_Dbar.pl
index 0c68f9779a..aaac405445 100644
--- a/tp/t/results/formatting/defcondx_Dbar.pl
+++ b/tp/t/results/formatting/defcondx_Dbar.pl
@@ -285,7 +285,6 @@ $result_trees{'defcondx_Dbar'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -355,7 +354,6 @@ 
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'par
 
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2];
-$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 $result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[0];
 $result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[0];
 $result_trees{'defcondx_Dbar'}{'contents'}[0]{'parent'} = 
$result_trees{'defcondx_Dbar'};
diff --git a/tp/t/results/formatting/defcondx_Ubar.pl 
b/tp/t/results/formatting/defcondx_Ubar.pl
index 00e25f2f39..6d36bfbc83 100644
--- a/tp/t/results/formatting/defcondx_Ubar.pl
+++ b/tp/t/results/formatting/defcondx_Ubar.pl
@@ -237,7 +237,6 @@ $result_trees{'defcondx_Ubar'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -301,7 +300,6 @@ 
$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'par
 
$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2];
-$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[0];
 $result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[0];
 $result_trees{'defcondx_Ubar'}{'contents'}[0]{'parent'} = 
$result_trees{'defcondx_Ubar'};
diff --git a/tp/t/results/formatting/direntry_dircategory_info_split.pl 
b/tp/t/results/formatting/direntry_dircategory_info_split.pl
index 60aaac7c87..9a1dbfd874 100644
--- a/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -278,9 +278,6 @@ $result_trees{'direntry_dircategory_info_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'direntry_dircategory.texi',
@@ -457,9 +454,6 @@ $result_trees{'direntry_dircategory_info_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'direntry_dircategory.texi',
@@ -712,9 +706,6 @@ $result_trees{'direntry_dircategory_info_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'direntry_dircategory.texi',
@@ -829,9 +820,6 @@ $result_trees{'direntry_dircategory_info_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'direntry_dircategory.texi',
@@ -1005,7 +993,6 @@ 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2];
-$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -1032,7 +1019,6 @@ 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5];
-$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'direntry_dircategory_info_split'}{'contents'}[0];
@@ -1070,7 +1056,6 @@ 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3];
-$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'direntry_dircategory_info_split'}{'contents'}[2];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'direntry_dircategory_info_split'}{'contents'}[2];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5];
@@ -1087,7 +1072,6 @@ 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5];
-$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'direntry_dircategory_info_split'}{'contents'}[2];
 
$result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'direntry_dircategory_info_split'}{'contents'}[2];
 $result_trees{'direntry_dircategory_info_split'}{'contents'}[2]{'parent'} = 
$result_trees{'direntry_dircategory_info_split'};
@@ -1229,8 +1213,7 @@ $result_nodes{'direntry_dircategory_info_split'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/float_copying.pl 
b/tp/t/results/formatting/float_copying.pl
index fb87fc6576..13e00b1d5d 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -604,7 +604,6 @@ $result_trees{'float_copying'} = {
                   ],
                   'extra' => {
                     'caption' => {},
-                    'end_command' => {},
                     'node_content' => [
                       {}
                     ],
@@ -654,9 +653,6 @@ $result_trees{'float_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => 'float_copying.texi',
@@ -1019,9 +1015,6 @@ $result_trees{'float_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'float_copying.texi',
@@ -1565,14 +1558,12 @@ 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'con
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1];
 $result_trees{'float_copying'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[0];
@@ -1628,7 +1619,6 @@ 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'par
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[9];
-$result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'}
 = $result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 $result_trees{'float_copying'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[2];
 $result_trees{'float_copying'}{'contents'}[2]{'contents'}[10]{'parent'} = 
$result_trees{'float_copying'}{'contents'}[2];
 $result_trees{'float_copying'}{'contents'}[2]{'parent'} = 
$result_trees{'float_copying'};
@@ -1856,8 +1846,7 @@ $result_nodes{'float_copying'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/split_nocopying.pl 
b/tp/t/results/formatting/split_nocopying.pl
index 9de9217b64..4269344de7 100644
--- a/tp/t/results/formatting/split_nocopying.pl
+++ b/tp/t/results/formatting/split_nocopying.pl
@@ -256,9 +256,6 @@ $result_trees{'split_nocopying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'split_nocopying.texi',
@@ -426,7 +423,6 @@ 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'p
 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3];
-$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'split_nocopying'}{'contents'}[2];
 $result_trees{'split_nocopying'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'split_nocopying'}{'contents'}[2];
 $result_trees{'split_nocopying'}{'contents'}[2]{'parent'} = 
$result_trees{'split_nocopying'};
@@ -540,8 +536,7 @@ $result_nodes{'split_nocopying'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/split_nocopying_split.pl 
b/tp/t/results/formatting/split_nocopying_split.pl
index 126e89bc89..f5a68e36aa 100644
--- a/tp/t/results/formatting/split_nocopying_split.pl
+++ b/tp/t/results/formatting/split_nocopying_split.pl
@@ -256,9 +256,6 @@ $result_trees{'split_nocopying_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'split_nocopying.texi',
@@ -426,7 +423,6 @@ 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}
 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3];
-$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'split_nocopying_split'}{'contents'}[2];
 $result_trees{'split_nocopying_split'}{'contents'}[2]{'contents'}[4]{'parent'} 
= $result_trees{'split_nocopying_split'}{'contents'}[2];
 $result_trees{'split_nocopying_split'}{'contents'}[2]{'parent'} = 
$result_trees{'split_nocopying_split'};
@@ -540,8 +536,7 @@ $result_nodes{'split_nocopying_split'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index ae0396d314..76766669a9 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -3992,9 +3992,6 @@ $result_trees{'texi_bib_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'bib-example.texi',
@@ -4435,7 +4432,6 @@ $result_trees{'texi_bib_example'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4964,7 +4960,6 @@ 
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'
 
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1];
-$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 $result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'texi_bib_example'}{'contents'}[2];
 $result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'texi_bib_example'}{'contents'}[2];
 $result_trees{'texi_bib_example'}{'contents'}[2]{'parent'} = 
$result_trees{'texi_bib_example'};
@@ -5025,7 +5020,6 @@ 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'
 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[2];
 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1];
 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[2];
 $result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'texi_bib_example'}{'contents'}[6];
 $result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'texi_bib_example'}{'contents'}[6];
 $result_trees{'texi_bib_example'}{'contents'}[6]{'parent'} = 
$result_trees{'texi_bib_example'};
@@ -5491,8 +5485,7 @@ $result_nodes{'texi_bib_example'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/formatting/texi_cond.pl 
b/tp/t/results/formatting/texi_cond.pl
index 21b9af9b45..55c5525c1e 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -152,9 +152,6 @@ $result_trees{'texi_cond'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'cond.texi',
@@ -270,9 +267,6 @@ $result_trees{'texi_cond'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {}
         },
         {
@@ -360,7 +354,6 @@ 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'
 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1];
-$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'texi_cond'}{'contents'}[1];
 $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'texi_cond'}{'contents'}[1];
 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[3];
@@ -378,7 +371,6 @@ 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'parent
 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 
$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11];
-$result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'}
 = $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11]{'contents'}[2];
 $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[11]{'parent'} = 
$result_trees{'texi_cond'}{'contents'}[1];
 $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[12]{'parent'} = 
$result_trees{'texi_cond'}{'contents'}[1];
 $result_trees{'texi_cond'}{'contents'}[1]{'contents'}[13]{'parent'} = 
$result_trees{'texi_cond'}{'contents'}[1];
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index 9ff2b3724d..f5abf61e34 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -516,9 +516,6 @@ $result_trees{'texi_glossary'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'glossary.texi',
@@ -1208,7 +1205,6 @@ 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'par
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1];
-$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'texi_glossary'}{'contents'}[2];
 $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'texi_glossary'}{'contents'}[2];
 
$result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'texi_glossary'}{'contents'}[2]{'contents'}[3];
@@ -1464,8 +1460,7 @@ $result_nodes{'texi_glossary'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index a9bb5aed18..f49e8d2137 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -222,9 +222,6 @@ $result_trees{'heading_in_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -339,7 +336,6 @@ 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0];
-$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 $result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'heading_in_copying'}{'contents'}[0];
 $result_trees{'heading_in_copying'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'heading_in_copying'}{'contents'}[0];
 $result_trees{'heading_in_copying'}{'contents'}[0]{'parent'} = 
$result_trees{'heading_in_copying'};
diff --git a/tp/t/results/heading/heading_in_example.pl 
b/tp/t/results/heading/heading_in_example.pl
index a7ee363e48..ba96e17f0e 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -111,9 +111,6 @@ $result_trees{'heading_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -140,7 +137,6 @@ 
$result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]
 
$result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'heading_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'heading_in_example'}{'contents'}[0];
 $result_trees{'heading_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'heading_in_example'};
 
diff --git a/tp/t/results/heading/heading_in_quotation.pl 
b/tp/t/results/heading/heading_in_quotation.pl
index 5e40f61060..f01dccc837 100644
--- a/tp/t/results/heading/heading_in_quotation.pl
+++ b/tp/t/results/heading/heading_in_quotation.pl
@@ -123,9 +123,6 @@ $result_trees{'heading_in_quotation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -154,7 +151,6 @@ 
$result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0];
-$result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'heading_in_quotation'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'heading_in_quotation'}{'contents'}[0];
 $result_trees{'heading_in_quotation'}{'contents'}[0]{'parent'} = 
$result_trees{'heading_in_quotation'};
 
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index f0985f9a58..85212cf5ae 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -534,9 +534,6 @@ $result_trees{'check_htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -847,7 +844,6 @@ 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'pa
 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 
$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3];
-$result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'check_htmlxref'}{'contents'}[2];
 $result_trees{'check_htmlxref'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'check_htmlxref'}{'contents'}[2];
 $result_trees{'check_htmlxref'}{'contents'}[2]{'parent'} = 
$result_trees{'check_htmlxref'};
@@ -978,8 +974,7 @@ $result_nodes{'check_htmlxref'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 db26cc0f19..a97fe11f65 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
@@ -534,9 +534,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -847,7 +844,6 @@ 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3];
-$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2];
 
$result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2];
 $result_trees{'check_htmlxref_ignore_ref_top_up'}{'contents'}[2]{'parent'} = 
$result_trees{'check_htmlxref_ignore_ref_top_up'};
@@ -978,8 +974,7 @@ $result_nodes{'check_htmlxref_ignore_ref_top_up'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/check_htmlxref_menu.pl 
b/tp/t/results/html_tests/check_htmlxref_menu.pl
index e593952c9b..235435a1e5 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -534,9 +534,6 @@ $result_trees{'check_htmlxref_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -847,7 +844,6 @@ 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[2
 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3];
-$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 $result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2];
 $result_trees{'check_htmlxref_menu'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'check_htmlxref_menu'}{'contents'}[2];
 $result_trees{'check_htmlxref_menu'}{'contents'}[2]{'parent'} = 
$result_trees{'check_htmlxref_menu'};
@@ -978,8 +974,7 @@ $result_nodes{'check_htmlxref_menu'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 9bfafb2965..bceee7d049 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
@@ -534,9 +534,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -847,7 +844,6 @@ 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'cont
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3];
-$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[3];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2];
 
$result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2];
 $result_trees{'check_htmlxref_no_use_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'check_htmlxref_no_use_nodes'};
@@ -978,8 +974,7 @@ $result_nodes{'check_htmlxref_no_use_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/commands_in_abbr.pl 
b/tp/t/results/html_tests/commands_in_abbr.pl
index 29b871f7d6..0a23a655cf 100644
--- a/tp/t/results/html_tests/commands_in_abbr.pl
+++ b/tp/t/results/html_tests/commands_in_abbr.pl
@@ -195,9 +195,6 @@ $result_trees{'commands_in_abbr'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -237,7 +234,6 @@ 
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'
 
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2];
-$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'commands_in_abbr'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'commands_in_abbr'}{'contents'}[0];
 $result_trees{'commands_in_abbr'}{'contents'}[0]{'parent'} = 
$result_trees{'commands_in_abbr'};
 
diff --git a/tp/t/results/html_tests/commands_in_alt.pl 
b/tp/t/results/html_tests/commands_in_alt.pl
index 0c39760c2b..717e999ed5 100644
--- a/tp/t/results/html_tests/commands_in_alt.pl
+++ b/tp/t/results/html_tests/commands_in_alt.pl
@@ -209,9 +209,6 @@ $result_trees{'commands_in_alt'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -254,7 +251,6 @@ 
$result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'p
 
$result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3];
-$result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'commands_in_alt'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'commands_in_alt'}{'contents'}[0];
 $result_trees{'commands_in_alt'}{'contents'}[0]{'parent'} = 
$result_trees{'commands_in_alt'};
 
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 44623ebd98..a41a1925b0 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -183,7 +183,6 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -223,9 +222,6 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -552,7 +548,6 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -607,12 +602,10 @@ 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[0]{'contents'}[2];
@@ -658,7 +651,6 @@ 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1];
-$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2];
 $result_trees{'deftypefnnewline_for_copying_after'}{'contents'}[2]{'parent'} = 
$result_trees{'deftypefnnewline_for_copying_after'};
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 37b2894827..977c05c1e2 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -226,7 +226,6 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -266,9 +265,6 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -512,7 +508,6 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -572,12 +567,10 @@ 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0];
 $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[0]{'parent'} 
= $result_trees{'deftypefnnewline_for_copying_before'};
@@ -613,7 +606,6 @@ 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1];
-$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2];
 
$result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2];
 $result_trees{'deftypefnnewline_for_copying_before'}{'contents'}[2]{'parent'} 
= $result_trees{'deftypefnnewline_for_copying_before'};
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index c29b58c30a..31605e08cf 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -275,9 +275,6 @@ $result_trees{'documentdescription'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -363,7 +360,6 @@ 
$result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0];
-$result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'documentdescription'}{'contents'}[0];
 $result_trees{'documentdescription'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'documentdescription'}{'contents'}[0];
 $result_trees{'documentdescription'}{'contents'}[0]{'parent'} = 
$result_trees{'documentdescription'};
diff --git a/tp/t/results/html_tests/example_at_commands_arguments.pl 
b/tp/t/results/html_tests/example_at_commands_arguments.pl
index 67a0c8fbc4..ec49779190 100644
--- a/tp/t/results/html_tests/example_at_commands_arguments.pl
+++ b/tp/t/results/html_tests/example_at_commands_arguments.pl
@@ -234,7 +234,6 @@ $result_trees{'example_at_commands_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -284,7 +283,6 @@ 
$result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0];
-$result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_at_commands_arguments'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'example_at_commands_arguments'}{'contents'}[0];
 $result_trees{'example_at_commands_arguments'}{'contents'}[0]{'parent'} = 
$result_trees{'example_at_commands_arguments'};
 
diff --git a/tp/t/results/html_tests/example_class.pl 
b/tp/t/results/html_tests/example_class.pl
index d65ce040f1..3a539baccc 100644
--- a/tp/t/results/html_tests/example_class.pl
+++ b/tp/t/results/html_tests/example_class.pl
@@ -157,7 +157,6 @@ $result_trees{'example_class'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -201,7 +200,6 @@ 
$result_trees{'example_class'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'par
 
$result_trees{'example_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'example_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'example_class'}{'contents'}[0]{'contents'}[0];
-$result_trees{'example_class'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'example_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'example_class'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'example_class'}{'contents'}[0];
 $result_trees{'example_class'}{'contents'}[0]{'parent'} = 
$result_trees{'example_class'};
 
diff --git a/tp/t/results/html_tests/example_empty_arguments.pl 
b/tp/t/results/html_tests/example_empty_arguments.pl
index 0c51e6a8d8..4f92258366 100644
--- a/tp/t/results/html_tests/example_empty_arguments.pl
+++ b/tp/t/results/html_tests/example_empty_arguments.pl
@@ -95,7 +95,6 @@ $result_trees{'example_empty_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -203,7 +202,6 @@ $result_trees{'example_empty_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -310,7 +308,6 @@ $result_trees{'example_empty_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -339,7 +336,6 @@ 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0];
-$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2];
@@ -354,7 +350,6 @@ 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2];
-$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4];
@@ -370,7 +365,6 @@ 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'contents
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4];
-$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'example_empty_arguments'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'example_empty_arguments'}{'contents'}[0];
 $result_trees{'example_empty_arguments'}{'contents'}[0]{'parent'} = 
$result_trees{'example_empty_arguments'};
 
diff --git a/tp/t/results/html_tests/example_multi_class.pl 
b/tp/t/results/html_tests/example_multi_class.pl
index 854b3c3916..e8e4946b08 100644
--- a/tp/t/results/html_tests/example_multi_class.pl
+++ b/tp/t/results/html_tests/example_multi_class.pl
@@ -235,7 +235,6 @@ $result_trees{'example_multi_class'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -293,7 +292,6 @@ 
$result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0];
-$result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'example_multi_class'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'example_multi_class'}{'contents'}[0];
 $result_trees{'example_multi_class'}{'contents'}[0]{'parent'} = 
$result_trees{'example_multi_class'};
 
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index dd2fffc701..1180935b08 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -101,9 +101,6 @@ $result_trees{'html_in_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -141,9 +138,6 @@ $result_trees{'html_in_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -252,12 +246,10 @@ 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'c
 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1];
-$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 $result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'html_in_copying'}{'contents'}[0];
 $result_trees{'html_in_copying'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'html_in_copying'}{'contents'}[0];
 $result_trees{'html_in_copying'}{'contents'}[0]{'parent'} = 
$result_trees{'html_in_copying'};
diff --git a/tp/t/results/html_tests/itemize_arguments.pl 
b/tp/t/results/html_tests/itemize_arguments.pl
index f7bcf9204a..07755c1191 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -91,7 +91,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -183,7 +182,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -319,7 +317,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -411,7 +408,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -503,7 +499,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -595,7 +590,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -716,7 +710,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -920,7 +913,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1048,7 +1040,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1178,7 +1169,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1278,7 +1268,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1408,7 +1397,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1508,7 +1496,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1608,7 +1595,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1736,7 +1722,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1866,7 +1851,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1994,7 +1978,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2124,7 +2107,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2336,7 +2318,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2548,7 +2529,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2948,7 +2928,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3348,7 +3327,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3724,7 +3702,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3845,7 +3822,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3979,7 +3955,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4115,7 +4090,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4278,7 +4252,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4414,7 +4387,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4542,7 +4514,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4672,7 +4643,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4829,7 +4799,6 @@ $result_trees{'itemize_arguments'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4959,7 +4928,6 @@ $result_trees{'itemize_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4991,7 +4959,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -5002,7 +4969,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5019,7 +4985,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0];
@@ -5030,7 +4995,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'args'}[0];
@@ -5041,7 +5005,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'args'}[0];
@@ -5052,7 +5015,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'args'}[0];
@@ -5067,7 +5029,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[13]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[14]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0];
@@ -5092,7 +5053,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[15]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[16]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0];
@@ -5108,7 +5068,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[17]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[18]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0];
@@ -5124,7 +5083,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[19]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[20]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'args'}[0];
@@ -5136,7 +5094,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[21]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[22]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'args'}[0]{'contents'}[0];
@@ -5152,7 +5109,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[23]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[24]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'args'}[0];
@@ -5165,7 +5121,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[25]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[26]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'args'}[0];
@@ -5178,7 +5133,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[27]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[28]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'args'}[0]{'contents'}[0];
@@ -5194,7 +5148,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[29]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[30]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'args'}[0]{'contents'}[0];
@@ -5210,7 +5163,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[31]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[32]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'contents'}[0];
@@ -5226,7 +5178,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[33]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[34]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'args'}[0]{'contents'}[0];
@@ -5242,7 +5193,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[35]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[36]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'args'}[0];
@@ -5269,7 +5219,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[37]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'args'}[0];
@@ -5296,7 +5245,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[39]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[40]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5349,7 +5297,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[41]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[42]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5402,7 +5349,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[43]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[44]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5449,7 +5395,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[45]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[46]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'args'}[0];
@@ -5464,7 +5409,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[47]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[48]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'args'}[0]{'contents'}[0];
@@ -5480,7 +5424,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[49]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[50]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'args'}[0]{'contents'}[0];
@@ -5496,7 +5439,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[51]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[52]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[53]{'args'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[53];
@@ -5515,7 +5457,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[55]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[56]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'args'}[0]{'contents'}[0];
@@ -5531,7 +5472,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[57]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[58]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'args'}[0]{'contents'}[0];
@@ -5547,7 +5487,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[59]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[60]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'args'}[0]{'contents'}[0];
@@ -5563,7 +5502,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[61]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[62]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[63]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[63]{'args'}[0];
@@ -5582,7 +5520,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'contents'}[1]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[65]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'args'}[0]{'contents'}[0];
@@ -5598,7 +5535,6 @@ 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'contents'}[0]
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'contents'}[1];
 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'contents'}[1];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[66]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[67]{'parent'} = 
$result_trees{'itemize_arguments'}{'contents'}[0];
 $result_trees{'itemize_arguments'}{'contents'}[0]{'parent'} = 
$result_trees{'itemize_arguments'};
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 32f69a8129..123f801404 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -91,7 +91,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -183,7 +182,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -319,7 +317,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -411,7 +408,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -503,7 +499,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -595,7 +590,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -716,7 +710,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -920,7 +913,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1048,7 +1040,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1178,7 +1169,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1278,7 +1268,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1408,7 +1397,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1508,7 +1496,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1608,7 +1595,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1736,7 +1722,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1866,7 +1851,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1994,7 +1978,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2124,7 +2107,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2336,7 +2318,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2548,7 +2529,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2948,7 +2928,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3348,7 +3327,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3724,7 +3702,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3845,7 +3822,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -3979,7 +3955,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4115,7 +4090,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4278,7 +4252,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4414,7 +4387,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4542,7 +4514,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4672,7 +4643,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4829,7 +4799,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4959,7 +4928,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -4991,7 +4959,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1]
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -5002,7 +4969,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5019,7 +4985,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'args'}[0];
@@ -5030,7 +4995,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'args'}[0];
@@ -5041,7 +5005,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'args'}[0];
@@ -5052,7 +5015,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'args'}[0];
@@ -5067,7 +5029,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0];
@@ -5092,7 +5053,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0];
@@ -5108,7 +5068,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0];
@@ -5124,7 +5083,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[20]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'args'}[0];
@@ -5136,7 +5094,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[21]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[22]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'args'}[0]{'contents'}[0];
@@ -5152,7 +5109,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[23]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[24]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'args'}[0];
@@ -5165,7 +5121,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[25]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[26]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'args'}[0];
@@ -5178,7 +5133,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[27]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[28]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'args'}[0]{'contents'}[0];
@@ -5194,7 +5148,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[29]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[30]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'args'}[0]{'contents'}[0];
@@ -5210,7 +5163,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[31]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[32]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'contents'}[0];
@@ -5226,7 +5178,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[33]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[34]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'args'}[0]{'contents'}[0];
@@ -5242,7 +5193,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[35]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[36]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'args'}[0];
@@ -5269,7 +5219,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[37]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'args'}[0];
@@ -5296,7 +5245,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[39]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[40]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5349,7 +5297,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[41]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[42]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5402,7 +5349,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[43]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[44]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -5449,7 +5395,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[45]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[46]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'args'}[0];
@@ -5464,7 +5409,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[47]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[48]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'args'}[0]{'contents'}[0];
@@ -5480,7 +5424,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[49]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[50]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'args'}[0]{'contents'}[0];
@@ -5496,7 +5439,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[51]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[52]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[53]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[53];
@@ -5515,7 +5457,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[55]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[56]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'args'}[0]{'contents'}[0];
@@ -5531,7 +5472,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[57]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[58]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'args'}[0]{'contents'}[0];
@@ -5547,7 +5487,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[59]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[60]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'args'}[0]{'contents'}[0];
@@ -5563,7 +5502,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[61]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[62]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[63]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[63]{'args'}[0];
@@ -5582,7 +5520,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[65]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'args'}[0]{'contents'}[0];
@@ -5598,7 +5535,6 @@ 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'contents'}[1];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[66]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[67]{'parent'}
 = $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0];
 $result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'parent'} = 
$result_trees{'itemize_arguments_enable_encoding'};
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo.pl
index 653006960d..875a33d4fc 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo.pl
@@ -157,9 +157,6 @@ $result_trees{'mathjax_with_texinfo'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -321,7 +318,6 @@ 
$result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0];
-$result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 $result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'mathjax_with_texinfo'}{'contents'}[0];
 $result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'mathjax_with_texinfo'}{'contents'}[0];
 
$result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'mathjax_with_texinfo'}{'contents'}[0]{'contents'}[2];
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 6536311028..b49deb046d 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
@@ -162,9 +162,6 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -327,7 +324,6 @@ 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}
 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[5];
 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[1];
-$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[1]{'contents'}[5];
 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0];
 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0];
 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo_enable_encoding'}{'contents'}[0]{'contents'}[3];
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 595a780dd6..4f7a4f6034 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
@@ -157,9 +157,6 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -321,7 +318,6 @@ 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'conten
 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[0];
-$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0];
 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0];
 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'mathjax_with_texinfo_no_convert_to_latex'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/html_tests/raw_html.pl 
b/tp/t/results/html_tests/raw_html.pl
index 1cbc298edf..ba7cf9d5f8 100644
--- a/tp/t/results/html_tests/raw_html.pl
+++ b/tp/t/results/html_tests/raw_html.pl
@@ -64,9 +64,6 @@ $result_trees{'raw_html'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -87,7 +84,6 @@ 
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_html'}{'contents'}[0]{'contents'}[0];
-$result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'raw_html'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'raw_html'}{'contents'}[0];
 $result_trees{'raw_html'}{'contents'}[0]{'parent'} = $result_trees{'raw_html'};
 
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index 3092ea6757..12229d8250 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -303,9 +303,6 @@ $result_trees{'redirection_same_labels'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -608,9 +605,6 @@ $result_trees{'redirection_same_labels'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -970,9 +964,6 @@ $result_trees{'redirection_same_labels'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -1134,7 +1125,6 @@ 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'};
@@ -1176,7 +1166,6 @@ 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1];
-$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'parent'}
 = $result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'};
@@ -1222,7 +1211,6 @@ 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[1];
-$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[1]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'contents'}[2]{'parent'}
 = 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8];
 
$result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'}{'contents'}[8]{'parent'}
 = $result_trees{'redirection_same_labels'}[0]{'contents'}[0]{'parent'};
@@ -1559,8 +1547,7 @@ $result_nodes{'redirection_same_labels'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1573,8 +1560,7 @@ $result_nodes{'redirection_same_labels'} = {
         'associated_section' => {},
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'umlaut'
@@ -1608,8 +1594,7 @@ $result_nodes{'redirection_same_labels'} = {
             'associated_section' => {},
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'circumflex'
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index 3759a7c117..2ab8455506 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -138,9 +138,6 @@ $result_trees{'ref_in_preformatted'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -290,9 +287,6 @@ $result_trees{'ref_in_preformatted'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -351,7 +345,6 @@ 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[0
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1];
-$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'ref_in_preformatted'}{'contents'}[1];
 $result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'ref_in_preformatted'}{'contents'}[1];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3];
@@ -372,7 +365,6 @@ 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[0
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3];
-$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 $result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'ref_in_preformatted'}{'contents'}[1];
 $result_trees{'ref_in_preformatted'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'ref_in_preformatted'}{'contents'}[1];
 
$result_trees{'ref_in_preformatted'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'ref_in_preformatted'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -408,8 +400,7 @@ $result_nodes{'ref_in_preformatted'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index 3268cf2cb1..151f7d60aa 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -219,8 +219,7 @@ $result_trees{'simple_menu'} = {
                             }
                           ],
                           'extra' => {
-                            'command_as_argument' => {},
-                            'end_command' => {}
+                            'command_as_argument' => {}
                           },
                           'parent' => {},
                           'source_info' => {
@@ -286,9 +285,6 @@ $result_trees{'simple_menu'} = {
                                   }
                                 }
                               ],
-                              'extra' => {
-                                'end_command' => {}
-                              },
                               'parent' => {},
                               'source_info' => {
                                 'file_name' => '',
@@ -425,8 +421,7 @@ $result_trees{'simple_menu'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
-                'end_command' => {}
+                'command_as_argument' => {}
               },
               'parent' => {},
               'source_info' => {
@@ -498,9 +493,6 @@ $result_trees{'simple_menu'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -607,8 +599,7 @@ $result_trees{'simple_menu'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
-                'end_command' => {}
+                'command_as_argument' => {}
               },
               'parent' => {},
               'source_info' => {
@@ -983,8 +974,7 @@ $result_trees{'simple_menu'} = {
                                 }
                               ],
                               'extra' => {
-                                'command_as_argument' => {},
-                                'end_command' => {}
+                                'command_as_argument' => {}
                               },
                               'parent' => {},
                               'source_info' => {
@@ -1050,9 +1040,6 @@ $result_trees{'simple_menu'} = {
                                       }
                                     }
                                   ],
-                                  'extra' => {
-                                    'end_command' => {}
-                                  },
                                   'parent' => {},
                                   'source_info' => {
                                     'file_name' => '',
@@ -1189,8 +1176,7 @@ $result_trees{'simple_menu'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
-                    'end_command' => {}
+                    'command_as_argument' => {}
                   },
                   'parent' => {},
                   'source_info' => {
@@ -1262,9 +1248,6 @@ $result_trees{'simple_menu'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -1371,8 +1354,7 @@ $result_trees{'simple_menu'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
-                    'end_command' => {}
+                    'command_as_argument' => {}
                   },
                   'parent' => {},
                   'source_info' => {
@@ -1638,9 +1620,6 @@ $result_trees{'simple_menu'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1678,9 +1657,6 @@ $result_trees{'simple_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1727,7 +1703,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
@@ -1735,7 +1710,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
@@ -1758,7 +1732,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1];
@@ -1767,7 +1740,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
@@ -1782,7 +1754,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'args'}[1];
@@ -1845,7 +1816,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
@@ -1853,7 +1823,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
@@ -1876,7 +1845,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
@@ -1885,7 +1853,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[3]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4];
@@ -1900,7 +1867,6 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[6]{'contents'}[0]{'args'}[1];
@@ -1948,12 +1914,10 @@ 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'conte
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[7]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[7];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[7]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[7];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
 
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
 $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'simple_menu'}{'contents'}[2];
 $result_trees{'simple_menu'}{'contents'}[2]{'parent'} = 
$result_trees{'simple_menu'};
 
@@ -2111,8 +2075,7 @@ $result_nodes{'simple_menu'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/html_tests/simple_menu_in_example.pl 
b/tp/t/results/html_tests/simple_menu_in_example.pl
index 5e304aa544..a29d74621c 100644
--- a/tp/t/results/html_tests/simple_menu_in_example.pl
+++ b/tp/t/results/html_tests/simple_menu_in_example.pl
@@ -163,9 +163,6 @@ $result_trees{'simple_menu_in_example'} = {
                               }
                             }
                           ],
-                          'extra' => {
-                            'end_command' => {}
-                          },
                           'parent' => {},
                           'source_info' => {
                             'file_name' => '',
@@ -263,9 +260,6 @@ $result_trees{'simple_menu_in_example'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -487,9 +481,6 @@ $result_trees{'simple_menu_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -527,9 +518,6 @@ $result_trees{'simple_menu_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -583,7 +571,6 @@ 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1];
-$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3];
@@ -597,7 +584,6 @@ 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
@@ -639,12 +625,10 @@ 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1];
-$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'simple_menu_in_example'}{'contents'}[1];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'simple_menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 93328d19f8..81e69ff205 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -179,9 +179,6 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -473,7 +470,6 @@ 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'c
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1];
-$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2];
 
$result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2];
 $result_trees{'test_xrefautomaticsectiontitle'}{'contents'}[2]{'parent'} = 
$result_trees{'test_xrefautomaticsectiontitle'};
@@ -604,8 +600,7 @@ $result_nodes{'test_xrefautomaticsectiontitle'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 f26c4ef799..90bb1ed693 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -223,9 +223,6 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -485,7 +482,6 @@ 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'conten
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1];
-$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2];
 
$result_trees{'test_xrefautomaticsectiontitle_off_first'}{'contents'}[2]{'parent'}
 = $result_trees{'test_xrefautomaticsectiontitle_off_first'};
@@ -614,8 +610,7 @@ $result_nodes{'test_xrefautomaticsectiontitle_off_first'} = 
{
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 e590c14606..e1d0c6d61e 100644
--- a/tp/t/results/html_tests/tex_expanded_in_copying.pl
+++ b/tp/t/results/html_tests/tex_expanded_in_copying.pl
@@ -78,9 +78,6 @@ $result_trees{'tex_expanded_in_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -118,9 +115,6 @@ $result_trees{'tex_expanded_in_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -142,12 +136,10 @@ 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0];
-$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'tex_expanded_in_copying'}{'contents'}[0];
 $result_trees{'tex_expanded_in_copying'}{'contents'}[0]{'parent'} = 
$result_trees{'tex_expanded_in_copying'};
 
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 48b055aee9..d6d54a49a9 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
@@ -282,7 +282,6 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
               ],
               'extra' => {
                 'columnfractions' => {},
-                'end_command' => {},
                 'max_columns' => 2,
                 'spaces_before_argument' => ' '
               },
@@ -323,9 +322,6 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -372,12 +368,10 @@ 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0];
 $result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'verbatim_in_multitable_in_example'};
 
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 0a6bf525d6..a92455a931 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -239,9 +239,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -450,9 +447,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -616,9 +610,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -793,9 +784,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -954,9 +942,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1161,9 +1146,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1370,9 +1352,6 @@ $result_trees{'htmlxref'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1505,9 +1484,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1674,9 +1650,6 @@ $result_trees{'htmlxref'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1813,9 +1786,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1959,9 +1929,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2125,9 +2092,6 @@ $result_trees{'htmlxref'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -2255,9 +2219,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2458,9 +2419,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2604,9 +2562,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2835,9 +2790,6 @@ $result_trees{'htmlxref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2911,7 +2863,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -2940,7 +2891,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'parent'}
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0];
@@ -2964,7 +2914,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'}
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[10]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -2989,7 +2938,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'parent'
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[12]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[13]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0];
@@ -3013,7 +2961,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'parent'
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[15]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[16]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[17]{'args'}[0];
@@ -3042,7 +2989,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'parent'
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[20]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[21]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[22]{'args'}[0];
@@ -3069,7 +3015,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3088,7 +3033,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'parent'
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[25]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[26]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0];
@@ -3111,7 +3055,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3131,7 +3074,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'contents'}[0]{'parent'
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[28]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[29]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0];
@@ -3151,7 +3093,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'parent'
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[31]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[32]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0];
@@ -3173,7 +3114,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3191,7 +3131,6 @@ 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'contents'}[0]{'parent'
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34];
-$result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[34]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'contents'}[35]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[2];
 $result_trees{'htmlxref'}{'contents'}[2]{'parent'} = $result_trees{'htmlxref'};
@@ -3218,7 +3157,6 @@ 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[4];
 $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[4];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -3238,7 +3176,6 @@ 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'parent'}
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[4];
 $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[4];
 $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6];
@@ -3275,7 +3212,6 @@ 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'parent'}
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 
$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6];
-$result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[6]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[4];
 $result_trees{'htmlxref'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'htmlxref'}{'contents'}[4];
 $result_trees{'htmlxref'}{'contents'}[4]{'parent'} = $result_trees{'htmlxref'};
@@ -3517,8 +3453,7 @@ $result_nodes{'htmlxref'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3536,8 +3471,7 @@ $result_nodes{'htmlxref'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'other-nodes'
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index 3df80dc031..5d1f55fbbf 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -239,9 +239,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -450,9 +447,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -616,9 +610,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -793,9 +784,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -954,9 +942,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1161,9 +1146,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1370,9 +1352,6 @@ $result_trees{'htmlxref_nodes'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1505,9 +1484,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1674,9 +1650,6 @@ $result_trees{'htmlxref_nodes'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1813,9 +1786,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1959,9 +1929,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2125,9 +2092,6 @@ $result_trees{'htmlxref_nodes'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -2255,9 +2219,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2458,9 +2419,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2604,9 +2562,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2835,9 +2790,6 @@ $result_trees{'htmlxref_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2911,7 +2863,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'pa
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -2940,7 +2891,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'pa
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0];
@@ -2964,7 +2914,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'pa
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[10]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -2989,7 +2938,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'p
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[12]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[13]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0];
@@ -3013,7 +2961,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'p
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[15]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[16]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[17]{'args'}[0];
@@ -3042,7 +2989,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[0]{'p
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[20]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[21]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[22]{'args'}[0];
@@ -3069,7 +3015,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'e
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3088,7 +3033,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[0]{'p
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[25]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[26]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0];
@@ -3111,7 +3055,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'e
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3131,7 +3074,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[0]{'p
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[28]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[29]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0];
@@ -3151,7 +3093,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[0]{'p
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[31]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[32]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0];
@@ -3173,7 +3114,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'e
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3191,7 +3131,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[0]{'p
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34];
-$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[34]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'contents'}[35]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_nodes'};
@@ -3218,7 +3157,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'pa
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[4];
 $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -3238,7 +3176,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'pa
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[4];
 $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6];
@@ -3275,7 +3212,6 @@ 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[2]{'pa
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 
$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6];
-$result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[6]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[4];
 $result_trees{'htmlxref_nodes'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'htmlxref_nodes'}{'contents'}[4];
 $result_trees{'htmlxref_nodes'}{'contents'}[4]{'parent'} = 
$result_trees{'htmlxref_nodes'};
@@ -3517,8 +3453,7 @@ $result_nodes{'htmlxref_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3536,8 +3471,7 @@ $result_nodes{'htmlxref_nodes'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'other-nodes'
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index f342de901b..15a38fa381 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -239,9 +239,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -450,9 +447,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -616,9 +610,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -793,9 +784,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -954,9 +942,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1161,9 +1146,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1370,9 +1352,6 @@ $result_trees{'htmlxref_only_mono'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1505,9 +1484,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1674,9 +1650,6 @@ $result_trees{'htmlxref_only_mono'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1813,9 +1786,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1959,9 +1929,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2125,9 +2092,6 @@ $result_trees{'htmlxref_only_mono'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -2255,9 +2219,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2458,9 +2419,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2604,9 +2562,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2835,9 +2790,6 @@ $result_trees{'htmlxref_only_mono'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2911,7 +2863,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[0]
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -2940,7 +2891,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'contents'}[0]
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0];
@@ -2964,7 +2914,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'contents'}[0]
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[10]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -2989,7 +2938,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'contents'}[0
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[12]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[13]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0];
@@ -3013,7 +2961,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[0
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[15]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[16]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[17]{'args'}[0];
@@ -3042,7 +2989,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'contents'}[0
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[20]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[21]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[22]{'args'}[0];
@@ -3069,7 +3015,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3088,7 +3033,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'contents'}[0
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[25]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[26]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0];
@@ -3111,7 +3055,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3131,7 +3074,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'contents'}[0
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[28]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[29]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0];
@@ -3151,7 +3093,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'contents'}[0
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[31]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[32]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0];
@@ -3173,7 +3114,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3191,7 +3131,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'contents'}[0
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34];
-$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[34]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'contents'}[35]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono'}{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_only_mono'};
@@ -3218,7 +3157,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1]{'contents'}[0]
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4];
 $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -3238,7 +3176,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'contents'}[0]
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4];
 $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6];
@@ -3275,7 +3212,6 @@ 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[2]
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6];
-$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[6]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4];
 $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'htmlxref_only_mono'}{'contents'}[4];
 $result_trees{'htmlxref_only_mono'}{'contents'}[4]{'parent'} = 
$result_trees{'htmlxref_only_mono'};
@@ -3517,8 +3453,7 @@ $result_nodes{'htmlxref_only_mono'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3536,8 +3471,7 @@ $result_nodes{'htmlxref_only_mono'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'other-nodes'
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 2285e17972..7cbe0cc978 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -239,9 +239,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -450,9 +447,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -616,9 +610,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -793,9 +784,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -954,9 +942,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1161,9 +1146,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1370,9 +1352,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1505,9 +1484,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1674,9 +1650,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1813,9 +1786,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1959,9 +1929,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2125,9 +2092,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -2255,9 +2219,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2458,9 +2419,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2604,9 +2562,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2835,9 +2790,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2911,7 +2863,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'content
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -2940,7 +2891,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'content
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0];
@@ -2964,7 +2914,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'content
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[9]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -2989,7 +2938,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[12]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[13]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0];
@@ -3013,7 +2961,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[15]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[16]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[17]{'args'}[0];
@@ -3042,7 +2989,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[20]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[21]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[22]{'args'}[0];
@@ -3069,7 +3015,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3088,7 +3033,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[25]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[26]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0];
@@ -3111,7 +3055,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3131,7 +3074,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[28]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[29]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0];
@@ -3151,7 +3093,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[31]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[32]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0];
@@ -3173,7 +3114,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3191,7 +3131,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'conten
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[34]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'contents'}[35]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_only_mono_nodes'};
@@ -3218,7 +3157,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1]{'content
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -3238,7 +3176,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'content
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6];
@@ -3275,7 +3212,6 @@ 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'content
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6];
-$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'contents'}[7]{'parent'}
 = $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4];
 $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[4]{'parent'} = 
$result_trees{'htmlxref_only_mono_nodes'};
@@ -3517,8 +3453,7 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3536,8 +3471,7 @@ $result_nodes{'htmlxref_only_mono_nodes'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'other-nodes'
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 83f270e992..f8da2b8c0f 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -239,9 +239,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -450,9 +447,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -616,9 +610,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -793,9 +784,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -954,9 +942,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1161,9 +1146,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1370,9 +1352,6 @@ $result_trees{'htmlxref_only_split'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1505,9 +1484,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1674,9 +1650,6 @@ $result_trees{'htmlxref_only_split'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1813,9 +1786,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1959,9 +1929,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2125,9 +2092,6 @@ $result_trees{'htmlxref_only_split'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -2255,9 +2219,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2458,9 +2419,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2604,9 +2562,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2835,9 +2790,6 @@ $result_trees{'htmlxref_only_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2911,7 +2863,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[0
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -2940,7 +2891,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'contents'}[0
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0];
@@ -2964,7 +2914,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'contents'}[0
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[10]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -2989,7 +2938,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[12]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[13]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0];
@@ -3013,7 +2961,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[15]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[16]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[17]{'args'}[0];
@@ -3042,7 +2989,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[20]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[21]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[22]{'args'}[0];
@@ -3069,7 +3015,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3088,7 +3033,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[25]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[26]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0];
@@ -3111,7 +3055,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3131,7 +3074,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[28]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[29]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0];
@@ -3151,7 +3093,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[31]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[32]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0];
@@ -3173,7 +3114,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3191,7 +3131,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'contents'}[
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34];
-$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[34]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'contents'}[35]{'parent'} 
= $result_trees{'htmlxref_only_split'}{'contents'}[2];
 $result_trees{'htmlxref_only_split'}{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_only_split'};
@@ -3218,7 +3157,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1]{'contents'}[0
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[4];
 $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[4];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -3238,7 +3176,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'contents'}[0
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[4];
 $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[4];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6];
@@ -3275,7 +3212,6 @@ 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[2
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6];
-$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[6]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[4];
 $result_trees{'htmlxref_only_split'}{'contents'}[4]{'contents'}[7]{'parent'} = 
$result_trees{'htmlxref_only_split'}{'contents'}[4];
 $result_trees{'htmlxref_only_split'}{'contents'}[4]{'parent'} = 
$result_trees{'htmlxref_only_split'};
@@ -3517,8 +3453,7 @@ $result_nodes{'htmlxref_only_split'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3536,8 +3471,7 @@ $result_nodes{'htmlxref_only_split'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'other-nodes'
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 300a639a69..814e77fd36 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -239,9 +239,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -450,9 +447,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -616,9 +610,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -793,9 +784,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -954,9 +942,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1161,9 +1146,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1370,9 +1352,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1505,9 +1484,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1674,9 +1650,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -1813,9 +1786,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -1959,9 +1929,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2125,9 +2092,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => 'test_refs.texi',
@@ -2255,9 +2219,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2458,9 +2419,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2604,9 +2562,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2835,9 +2790,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'test_refs.texi',
@@ -2911,7 +2863,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'conten
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -2940,7 +2891,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'conten
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'args'}[0];
@@ -2964,7 +2914,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'conten
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[9]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[10]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[11]{'contents'}[0]{'args'}[0];
@@ -2989,7 +2938,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[12]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[13]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[14]{'contents'}[0]{'args'}[0];
@@ -3013,7 +2961,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[15]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[16]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[17]{'args'}[0];
@@ -3042,7 +2989,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[20]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[21]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[22]{'args'}[0];
@@ -3069,7 +3015,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[24]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3088,7 +3033,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[25]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[26]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[0]{'args'}[0];
@@ -3111,7 +3055,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[27]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3131,7 +3074,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[28]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[29]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[30]{'contents'}[0]{'args'}[0];
@@ -3151,7 +3093,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[31]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[32]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[0]{'args'}[0];
@@ -3173,7 +3114,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'contents'}[1]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'};
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'extra'}{'node_content'}[0]
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[33]{'contents'}[2]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
@@ -3191,7 +3131,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'conte
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[34]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'contents'}[35]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2];
 $result_trees{'htmlxref_only_split_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'htmlxref_only_split_nodes'};
@@ -3218,7 +3157,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1]{'conten
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -3238,7 +3176,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'conten
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6];
@@ -3275,7 +3212,6 @@ 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'conten
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6];
-$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'contents'}[3];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4];
 
$result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'contents'}[7]{'parent'}
 = $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4];
 $result_trees{'htmlxref_only_split_nodes'}{'contents'}[4]{'parent'} = 
$result_trees{'htmlxref_only_split_nodes'};
@@ -3517,8 +3453,7 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3536,8 +3471,7 @@ $result_nodes{'htmlxref_only_split_nodes'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'other-nodes'
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 0ff96d2d0e..dbaf9e774c 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -255,9 +255,6 @@ $result_trees{'double_index_entry'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -490,7 +487,6 @@ 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[8]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -555,8 +551,7 @@ $result_nodes{'double_index_entry'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 3ae26c16e2..75ce247971 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -194,7 +194,6 @@ $result_trees{'empty_index_entry'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -290,7 +289,6 @@ 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{
 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1];
-$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'empty_index_entry'}{'contents'}[2];
 $result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'empty_index_entry'}{'contents'}[2];
 
$result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0];
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 07a1dea888..4eacd16b5d 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -267,7 +267,6 @@ $result_trees{'empty_string_index_entry'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -607,7 +606,6 @@ $result_trees{'empty_string_index_entry'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -716,7 +714,6 @@ 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'content
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -760,7 +757,6 @@ 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'content
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[2];
 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[7]{'args'}[0];
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index f6b4a64d51..1a6614c34f 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -274,7 +274,6 @@ $result_trees{'ftable_vtable'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -526,7 +525,6 @@ $result_trees{'ftable_vtable'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -731,7 +729,6 @@ 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'arg
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'ftable_vtable'}{'contents'}[1];
 $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'args'}[0];
@@ -770,7 +767,6 @@ 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'arg
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[2];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'contents'}[2];
 $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'ftable_vtable'}{'contents'}[1];
 $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'ftable_vtable'}{'contents'}[1];
 
$result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ftable_vtable'}{'contents'}[1]{'contents'}[5]{'args'}[0];
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 1a10a183b4..1ae97e016f 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -201,9 +201,6 @@ $result_trees{'index_entry_before_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -540,7 +537,6 @@ 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1];
-$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'index_entry_before_node'}{'contents'}[1];
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'index_entry_before_node'}{'contents'}[1];
 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'index_entry_before_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -622,8 +618,7 @@ $result_nodes{'index_entry_before_node'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 8a79993a48..87780189ff 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
@@ -144,9 +144,6 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -457,7 +454,6 @@ 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'cont
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_different_node_end'}{'contents'}[1]{'contents'}[3];
@@ -537,8 +533,7 @@ $result_nodes{'index_entry_in_footnote_different_node_end'} 
= {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 a8613609ef..3da4f42483 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -176,9 +176,6 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -492,7 +489,6 @@ 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1];
-$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'index_entry_in_footnote_separate'}{'contents'}[1];
 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_in_footnote_separate'}{'contents'}[1]{'contents'}[3];
@@ -573,8 +569,7 @@ $result_nodes{'index_entry_in_footnote_separate'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 363b551a8e..508257aefc 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -317,7 +317,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                     }
                   ],
                   'extra' => {
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -483,7 +482,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   ],
                   'extra' => {
                     'command_as_argument' => {},
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -566,9 +564,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -791,9 +786,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1005,7 +997,6 @@ 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
@@ -1030,7 +1021,6 @@ 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
@@ -1040,7 +1030,6 @@ 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'printindex_index_entry_in_copying'}{'contents'}[0];
@@ -1072,7 +1061,6 @@ 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4];
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'printindex_index_entry_in_copying'}{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'printindex_index_entry_in_copying'}{'contents'}[2];
 $result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'parent'} = 
$result_trees{'printindex_index_entry_in_copying'};
@@ -1206,8 +1194,7 @@ $result_nodes{'printindex_index_entry_in_copying'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 a0a7a20e6d..6f8ca940d6 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
@@ -199,9 +199,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -424,9 +421,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -579,7 +573,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'c
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[0];
@@ -611,7 +604,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'c
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4];
-$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[4]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'contents'}[5]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying_in_footnote'}{'contents'}[2]{'parent'}
 = $result_trees{'printindex_index_entry_in_copying_in_footnote'};
@@ -731,8 +723,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_in_footnote'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 8ce56eaf31..025b894b78 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
@@ -317,7 +317,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                     }
                   ],
                   'extra' => {
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -483,7 +482,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   ],
                   'extra' => {
                     'command_as_argument' => {},
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -566,9 +564,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -774,9 +769,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -971,7 +963,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
@@ -996,7 +987,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
@@ -1006,7 +996,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[9];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0];
@@ -1036,7 +1025,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3];
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[4]{'parent'}
 = 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2];
 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'parent'}
 = $result_trees{'printindex_index_entry_in_copying_no_insertcopying'};
@@ -1166,8 +1154,7 @@ 
$result_nodes{'printindex_index_entry_in_copying_no_insertcopying'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 6c634160d7..622d712375 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -292,7 +292,6 @@ $result_trees{'same_index_entry_merged_indices'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -437,7 +436,6 @@ $result_trees{'same_index_entry_merged_indices'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -534,7 +532,6 @@ 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -556,7 +553,6 @@ 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5];
-$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'same_index_entry_merged_indices'}{'contents'}[2];
 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'same_index_entry_merged_indices'}{'contents'}[2]{'contents'}[7]{'args'}[0];
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 a89c9570cb..a9d96d495c 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -321,9 +321,6 @@ $result_trees{'before_node_and_section'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -573,9 +570,6 @@ $result_trees{'before_node_and_section'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -764,7 +758,6 @@ 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2];
-$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'before_node_and_section'}{'contents'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'before_node_and_section'}{'contents'}[0];
 $result_trees{'before_node_and_section'}{'contents'}[0]{'parent'} = 
$result_trees{'before_node_and_section'};
@@ -805,7 +798,6 @@ 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents
 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3];
-$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'before_node_and_section'}{'contents'}[2];
 
$result_trees{'before_node_and_section'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'before_node_and_section'}{'contents'}[2];
 $result_trees{'before_node_and_section'}{'contents'}[2]{'parent'} = 
$result_trees{'before_node_and_section'};
@@ -930,8 +922,7 @@ $result_nodes{'before_node_and_section'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/center_flush.pl 
b/tp/t/results/info_tests/center_flush.pl
index 7d731b869d..89983175b0 100644
--- a/tp/t/results/info_tests/center_flush.pl
+++ b/tp/t/results/info_tests/center_flush.pl
@@ -204,9 +204,6 @@ $result_trees{'center_flush'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -423,9 +420,6 @@ $result_trees{'center_flush'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -468,7 +462,6 @@ 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'contents'}[7]{'pare
 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'contents'}[8]{'args'}[0];
 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'contents'}[8];
 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'center_flush'}{'contents'}[0]{'contents'}[2];
-$result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'contents'}[8];
 $result_trees{'center_flush'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'center_flush'}{'contents'}[0];
 $result_trees{'center_flush'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'center_flush'}{'contents'}[0];
 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'center_flush'}{'contents'}[0]{'contents'}[4];
@@ -502,7 +495,6 @@ 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[7]{'pare
 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[8]{'args'}[0];
 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[8];
 
$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[8]{'parent'}
 = $result_trees{'center_flush'}{'contents'}[0]{'contents'}[4];
-$result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'contents'}[8];
 $result_trees{'center_flush'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'center_flush'}{'contents'}[0];
 $result_trees{'center_flush'}{'contents'}[0]{'parent'} = 
$result_trees{'center_flush'};
 
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 e25fbe03d4..13190c62ba 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -232,7 +232,6 @@ $result_trees{'colon_in_index_entry'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -547,7 +546,6 @@ $result_trees{'colon_in_index_entry'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -652,7 +650,6 @@ 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
 $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'parent'} 
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
 $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[6]{'parent'} 
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -696,7 +693,6 @@ 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[2];
 $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'parent'} 
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
 $result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[8]{'parent'} 
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[9]{'args'}[0];
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 38bb27bf87..aa6fc8f180 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
@@ -246,9 +246,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -541,9 +538,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -862,7 +856,6 @@ 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -906,7 +899,6 @@ 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5];
-$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node'}{'contents'}[2]{'contents'}[7]{'args'}[0];
@@ -1006,8 +998,7 @@ $result_nodes{'colons_in_index_entries_and_node'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 44a2b1706e..f281994a9e 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
@@ -246,9 +246,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -541,9 +538,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -862,7 +856,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'con
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -906,7 +899,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'con
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5];
-$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2];
 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'colons_in_index_entries_and_node_no_quoting'}{'contents'}[2]{'contents'}[7]{'args'}[0];
@@ -1006,8 +998,7 @@ 
$result_nodes{'colons_in_index_entries_and_node_no_quoting'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index 11acb3525d..76a7fc5d30 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -395,7 +395,6 @@ $result_trees{'def_in_copying'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -435,9 +434,6 @@ $result_trees{'def_in_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -689,7 +685,6 @@ $result_trees{'def_in_copying'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -805,12 +800,10 @@ 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'co
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'def_in_copying'}{'contents'}[2];
 $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'def_in_copying'}{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[3];
@@ -849,7 +842,6 @@ 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[2]{'pa
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[3];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4];
-$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[3];
 $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'def_in_copying'}{'contents'}[2];
 $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'def_in_copying'}{'contents'}[2];
 
$result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_in_copying'}{'contents'}[2]{'contents'}[6]{'args'}[0];
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 21e8c9012f..5e2d3d74b8 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -213,9 +213,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -392,9 +389,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -540,7 +534,6 @@ 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'direntry_dircategory_and_commands'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'direntry_dircategory_and_commands'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -567,7 +560,6 @@ 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'direntry_dircategory_and_commands'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'direntry_dircategory_and_commands'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'direntry_dircategory_and_commands'}{'contents'}[0];
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 80a5048128..609d7aca53 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
@@ -997,9 +997,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1207,7 +1204,6 @@ 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[4];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[4]{'parent'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7];
-$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'contents'}[4];
 
$result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'contents'}[7]{'parent'}
 = $result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6];
 $result_trees{'end_of_line_command_in_node_lines'}{'contents'}[6]{'parent'} = 
$result_trees{'end_of_line_command_in_node_lines'};
 
@@ -1392,8 +1388,7 @@ $result_nodes{'end_of_line_command_in_node_lines'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'new-n'
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index f2bf9a9d1f..164c1d56ff 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -284,7 +284,6 @@ $result_trees{'error_in_footnote'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -451,7 +450,6 @@ 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{
 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[5];
 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'contents'}[5];
 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'error_in_footnote'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'error_in_footnote'}{'contents'}[1];
diff --git a/tp/t/results/info_tests/float_long_captions.pl 
b/tp/t/results/info_tests/float_long_captions.pl
index e8367e8286..9930c68648 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -135,7 +135,6 @@ $result_trees{'float_long_captions'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -259,7 +258,6 @@ $result_trees{'float_long_captions'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -363,7 +361,6 @@ 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[2
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'float_long_captions'}{'contents'}[1];
@@ -382,7 +379,6 @@ 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[2
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[2];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'extra'}{'caption'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'contents'}[2];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
 $result_trees{'float_long_captions'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'float_long_captions'}{'contents'}[1];
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 c7268f423b..24f41367ad 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
@@ -242,9 +242,6 @@ $result_trees{'index_entry_at_end_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -551,7 +548,6 @@ 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents
 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2];
-$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'contents'}[2];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[2];
 
$result_trees{'index_entry_at_end_node'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'index_entry_at_end_node'}{'contents'}[2];
 $result_trees{'index_entry_at_end_node'}{'contents'}[2]{'parent'} = 
$result_trees{'index_entry_at_end_node'};
@@ -712,8 +708,7 @@ $result_nodes{'index_entry_at_end_node'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 dcd1db8179..af6885e73d 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
@@ -364,9 +364,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -885,7 +882,6 @@ 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'con
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1];
-$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'invalid_node_name_no_warning'}{'contents'}[1];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'invalid_node_name_no_warning'}{'contents'}[1];
 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_no_warning'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -993,8 +989,7 @@ $result_nodes{'invalid_node_name_no_warning'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 6aefdb4046..d1ecd0f86d 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -364,9 +364,6 @@ $result_trees{'invalid_node_name_warning'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -885,7 +882,6 @@ 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'conten
 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1];
-$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'invalid_node_name_warning'}{'contents'}[1];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'invalid_node_name_warning'}{'contents'}[1];
 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_node_name_warning'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -993,8 +989,7 @@ $result_nodes{'invalid_node_name_warning'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 a4c9b3f645..b0fd5cd046 100644
--- a/tp/t/results/info_tests/multiline_image_and_align.pl
+++ b/tp/t/results/info_tests/multiline_image_and_align.pl
@@ -452,9 +452,6 @@ $result_trees{'multiline_image_and_align'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1183,9 +1180,6 @@ $result_trees{'multiline_image_and_align'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1256,7 +1250,6 @@ 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'conten
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'parent'}
 = $result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8];
-$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'multiline_image_and_align'}{'contents'}[0];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'multiline_image_and_align'}{'contents'}[0];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -1355,7 +1348,6 @@ 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18]{'conte
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18]{'contents'}[5]{'args'}[0];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18]{'contents'}[5];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18]{'contents'}[5]{'parent'}
 = $result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18];
-$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18]{'contents'}[5];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'multiline_image_and_align'}{'contents'}[0];
 $result_trees{'multiline_image_and_align'}{'contents'}[0]{'parent'} = 
$result_trees{'multiline_image_and_align'};
 
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 d4f9262e6c..403beba77e 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
@@ -432,7 +432,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -816,7 +815,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -1036,7 +1034,6 @@ 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'columnfractions'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -1090,7 +1087,6 @@ 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
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 0dbf3b60c1..8a84c86994 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -302,7 +302,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
                             }
                           ],
                           'extra' => {
-                            'end_command' => {},
                             'max_columns' => 2,
                             'prototypes' => [
                               {
@@ -545,7 +544,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -759,7 +757,6 @@ 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'c
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -792,7 +789,6 @@ 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'c
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index 2adfeba569..1a01b0e7e5 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -83,9 +83,6 @@ $result_trees{'paragraphindent_and_preamble'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -304,7 +301,6 @@ 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_and_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
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 af8b2a4e8c..05acf4d28d 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
@@ -83,9 +83,6 @@ $result_trees{'paragraphindent_in_preamble_and_in_document'} 
= {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -358,7 +355,6 @@ 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'con
 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
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 feb99ba9ef..e184e7fc15 100644
--- a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
@@ -83,9 +83,6 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -304,7 +301,6 @@ 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'
 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'paragraphindent_not_in_preamble'}{'contents'}[0];
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 e14e771e03..6cedddbc7c 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -1980,9 +1980,6 @@ $result_trees{'quote_node_names_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodequote.texi',
@@ -2571,7 +2568,6 @@ 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[6]{'args'}[0];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[6];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[6]{'parent'}
 = $result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27];
-$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'contents'}[6];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[27]{'parent'} 
= $result_trees{'quote_node_names_info'}{'contents'}[2];
 
$result_trees{'quote_node_names_info'}{'contents'}[2]{'contents'}[28]{'parent'} 
= $result_trees{'quote_node_names_info'}{'contents'}[2];
 $result_trees{'quote_node_names_info'}{'contents'}[2]{'parent'} = 
$result_trees{'quote_node_names_info'};
@@ -2856,8 +2852,7 @@ $result_nodes{'quote_node_names_info'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 b7248ffeb4..9e20278fcc 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -163,9 +163,6 @@ $result_trees{'space_at_menu_end'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -239,7 +236,6 @@ 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'space_at_menu_end'}{'contents'}[1];
 $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'space_at_menu_end'}{'contents'}[1];
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[3];
@@ -271,8 +267,7 @@ $result_nodes{'space_at_menu_end'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index 65576b66ea..3bea6f09c1 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -196,9 +196,6 @@ $result_trees{'space_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -340,7 +337,6 @@ 
$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'par
 
$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3];
-$result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'space_in_menu'}{'contents'}[2];
 $result_trees{'space_in_menu'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'space_in_menu'}{'contents'}[2];
 $result_trees{'space_in_menu'}{'contents'}[2]{'parent'} = 
$result_trees{'space_in_menu'};
@@ -444,8 +440,7 @@ $result_nodes{'space_in_menu'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index 74fef89d41..2bab7809dc 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -243,9 +243,6 @@ $result_trees{'split_no_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -411,7 +408,6 @@ 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'
 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3];
-$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'split_no_copying'}{'contents'}[2];
 $result_trees{'split_no_copying'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'split_no_copying'}{'contents'}[2];
 $result_trees{'split_no_copying'}{'contents'}[2]{'parent'} = 
$result_trees{'split_no_copying'};
@@ -526,8 +522,7 @@ $result_nodes{'split_no_copying'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 f5431279db..2b1592502a 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
@@ -249,9 +249,6 @@ $result_trees{'split_test_before_first_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -406,7 +403,6 @@ 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'con
 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'split_test_before_first_node'}{'contents'}[2];
 
$result_trees{'split_test_before_first_node'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'split_test_before_first_node'}{'contents'}[2];
 $result_trees{'split_test_before_first_node'}{'contents'}[2]{'parent'} = 
$result_trees{'split_test_before_first_node'};
@@ -520,8 +516,7 @@ $result_nodes{'split_test_before_first_node'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 9142f6c693..2a12a09414 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
@@ -243,9 +243,6 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -399,7 +396,6 @@ 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'cont
 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3];
-$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2];
 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2];
 
$result_trees{'split_test_before_first_node_no_empty_line'}{'contents'}[2]{'parent'}
 = $result_trees{'split_test_before_first_node_no_empty_line'};
@@ -511,8 +507,7 @@ $result_nodes{'split_test_before_first_node_no_empty_line'} 
= {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index 357280768c..c0b54a21c0 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -753,7 +753,6 @@ $result_trees{'test_index'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1006,7 +1005,6 @@ $result_trees{'test_index'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1180,9 +1178,6 @@ $result_trees{'test_index'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -3430,7 +3425,6 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[3];
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'test_index'}{'contents'}[2];
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'test_index'}{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'args'}[0];
@@ -3470,7 +3464,6 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'args'}
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2];
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'test_index'}{'contents'}[2];
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[8]{'parent'} = 
$result_trees{'test_index'}{'contents'}[2];
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'args'}[0]{'parent'} 
= $result_trees{'test_index'}{'contents'}[2]{'contents'}[9];
@@ -3497,7 +3490,6 @@ 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'parent
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'args'}[0];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[2];
 
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[9];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'extra'}{'end_command'}
 = $result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[2];
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'test_index'}{'contents'}[2];
 $result_trees{'test_index'}{'contents'}[2]{'contents'}[10]{'parent'} = 
$result_trees{'test_index'}{'contents'}[2];
 $result_trees{'test_index'}{'contents'}[2]{'parent'} = 
$result_trees{'test_index'};
@@ -4462,8 +4454,7 @@ $result_nodes{'test_index'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index 5758412f1c..d239a260c3 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -179,9 +179,6 @@ $result_trees{'text_before_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -309,7 +306,6 @@ 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'
 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'text_before_node'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'text_before_node'}{'contents'}[2];
 $result_trees{'text_before_node'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'text_before_node'}{'contents'}[2];
 
$result_trees{'text_before_node'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'text_before_node'}{'contents'}[2]{'contents'}[3];
@@ -405,8 +401,7 @@ $result_nodes{'text_before_node'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index 0010e4a47d..4d479c97e6 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -221,9 +221,6 @@ $result_trees{'top_node_normalization'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -289,7 +286,6 @@ 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3];
-$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'contents'}[3]{'parent'} 
= $result_trees{'top_node_normalization'}{'contents'}[1];
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'top_node_normalization'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'top_node_normalization'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -316,8 +312,7 @@ $result_nodes{'top_node_normalization'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 a08eaba801..74f001c050 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
@@ -83,9 +83,6 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -341,7 +338,6 @@ 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'
 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
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 af2a41c96f..bb84daa11c 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
@@ -83,9 +83,6 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -395,7 +392,6 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{
 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl 
b/tp/t/results/init_files_tests/documentation_examples.pl
index 1b5a05efce..c306196107 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -616,9 +616,6 @@ $result_trees{'documentation_examples'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -753,7 +750,6 @@ 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8]{'contents'
 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8]{'contents'}[1];
 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8];
-$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8]{'contents'}[1];
 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[8]{'parent'} 
= $result_trees{'documentation_examples'}{'contents'}[1];
 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[9]{'parent'} 
= $result_trees{'documentation_examples'}{'contents'}[1];
 
$result_trees{'documentation_examples'}{'contents'}[1]{'contents'}[10]{'parent'}
 = $result_trees{'documentation_examples'}{'contents'}[1];
diff --git a/tp/t/results/invalid_nestings/bad_style_nesting.pl 
b/tp/t/results/invalid_nestings/bad_style_nesting.pl
index 2bf393f6e3..f4bd701484 100644
--- a/tp/t/results/invalid_nestings/bad_style_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_style_nesting.pl
@@ -93,9 +93,6 @@ $result_trees{'bad_style_nesting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -120,7 +117,6 @@ 
$result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{
 
$result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1];
-$result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'bad_style_nesting'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'bad_style_nesting'}{'contents'}[0];
 $result_trees{'bad_style_nesting'}{'contents'}[0]{'parent'} = 
$result_trees{'bad_style_nesting'};
 
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl 
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index 28569c3980..0c59f63abc 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -163,7 +163,6 @@ $result_trees{'bad_tab_nesting'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -214,7 +213,6 @@ 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'p
 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0];
-$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'bad_tab_nesting'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'bad_tab_nesting'}{'contents'}[0];
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 2b972e083f..44250cfdc8 100644
--- a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
@@ -93,9 +93,6 @@ $result_trees{'cartouche_in_style_command'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -125,7 +122,6 @@ 
$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1]{'conte
 
$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1];
-$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'cartouche_in_style_command'}{'contents'}[0];
 
$result_trees{'cartouche_in_style_command'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'cartouche_in_style_command'}{'contents'}[0];
 $result_trees{'cartouche_in_style_command'}{'contents'}[0]{'parent'} = 
$result_trees{'cartouche_in_style_command'};
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index 783d1a4f9d..c5b853feb7 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -628,7 +628,6 @@ $result_trees{'center'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -785,7 +784,6 @@ $result_trees{'center'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1240,7 +1238,6 @@ $result_trees{'center'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -1468,7 +1465,6 @@ 
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]
 
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'parent'} 
= $result_trees{'center'}{'contents'}[0]{'contents'}[20];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'extra'}{'end_command'} 
= $result_trees{'center'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 $result_trees{'center'}{'contents'}[0]{'contents'}[20]{'parent'} = 
$result_trees{'center'}{'contents'}[0];
 $result_trees{'center'}{'contents'}[0]{'contents'}[21]{'parent'} = 
$result_trees{'center'}{'contents'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[0]{'contents'}[22]{'args'}[0];
@@ -1488,7 +1484,6 @@ 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]
 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'parent'} 
= $result_trees{'center'}{'contents'}[0]{'contents'}[22];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'extra'}{'end_command'} 
= $result_trees{'center'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
 $result_trees{'center'}{'contents'}[0]{'contents'}[22]{'parent'} = 
$result_trees{'center'}{'contents'}[0];
 $result_trees{'center'}{'contents'}[0]{'contents'}[23]{'parent'} = 
$result_trees{'center'}{'contents'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'parent'} 
= $result_trees{'center'}{'contents'}[0]{'contents'}[24];
@@ -1546,7 +1541,6 @@ 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'contents'}[0]{'parent'}
 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'args'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'center'}{'contents'}[0]{'contents'}[33]{'contents'}[1];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'parent'} 
= $result_trees{'center'}{'contents'}[0]{'contents'}[33];
-$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'extra'}{'end_command'} 
= $result_trees{'center'}{'contents'}[0]{'contents'}[33]{'contents'}[1];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'center'}{'contents'}[0]{'contents'}[33]{'args'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'center'}{'contents'}[0]{'contents'}[33]{'parent'} = 
$result_trees{'center'}{'contents'}[0];
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 85dba1d9cb..1ba8b90618 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -181,7 +181,6 @@ $result_trees{'def_in_style_command'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -222,7 +221,6 @@ 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1];
-$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 $result_trees{'def_in_style_command'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'def_in_style_command'}{'contents'}[0];
 $result_trees{'def_in_style_command'}{'contents'}[0]{'parent'} = 
$result_trees{'def_in_style_command'};
 
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 fc45770cbe..cfd728905c 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
@@ -239,9 +239,6 @@ $result_trees{'def_not_closed_in_menu_description'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -290,7 +287,6 @@ 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0];
-$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_not_closed_in_menu_description'}{'contents'}[0];
 $result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'parent'} = 
$result_trees{'def_not_closed_in_menu_description'};
 
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 6f9d016854..98880f1e28 100644
--- a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
@@ -114,7 +114,6 @@ $result_trees{'enumerate_in_style_command'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -144,7 +143,6 @@ 
$result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1]{'conte
 
$result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1];
-$result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'enumerate_in_style_command'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_in_style_command'}{'contents'}[0];
 $result_trees{'enumerate_in_style_command'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_in_style_command'};
 
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 65dcdf32a5..83ca82a4ea 100644
--- a/tp/t/results/invalid_nestings/example_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/example_in_style_command.pl
@@ -93,9 +93,6 @@ $result_trees{'example_in_style_command'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -120,7 +117,6 @@ 
$result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1]{'content
 
$result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1];
-$result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'example_in_style_command'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'example_in_style_command'}{'contents'}[0];
 $result_trees{'example_in_style_command'}{'contents'}[0]{'parent'} = 
$result_trees{'example_in_style_command'};
 
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 9d3e1aed68..e059a5b170 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -147,7 +147,6 @@ $result_trees{'float_in_style_command'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -194,7 +193,6 @@ 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'
 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'caption'}
 = 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'float_in_style_command'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'float_in_style_command'}{'contents'}[0];
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 d2dff1b865..9fbfdb2d6b 100644
--- a/tp/t/results/invalid_nestings/flushright_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
@@ -93,9 +93,6 @@ $result_trees{'flushright_in_style_command'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -120,7 +117,6 @@ 
$result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1]{'cont
 
$result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1];
-$result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'flushright_in_style_command'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'flushright_in_style_command'}{'contents'}[0];
 $result_trees{'flushright_in_style_command'}{'contents'}[0]{'parent'} = 
$result_trees{'flushright_in_style_command'};
 
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 c03a6ae76d..f2ed853e9b 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
@@ -272,9 +272,6 @@ $result_trees{'formats_not_closed_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -321,7 +318,6 @@ 
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formats_not_closed_in_example'}{'contents'}[0];
 $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'formats_not_closed_in_example'};
 
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl 
b/tp/t/results/invalid_nestings/in_errormsg.pl
index 2778b95299..326104ebd4 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -271,7 +271,6 @@ $result_trees{'in_errormsg'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -323,7 +322,6 @@ 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'
 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 $result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'in_errormsg'}{'contents'}[0];
 $result_trees{'in_errormsg'}{'contents'}[0]{'parent'} = 
$result_trees{'in_errormsg'};
 
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index 8a810e4c3a..2977d79122 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -102,7 +102,6 @@ $result_trees{'in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -611,7 +610,6 @@ $result_trees{'in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -943,7 +941,6 @@ $result_trees{'in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1065,7 +1062,6 @@ 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 $result_trees{'in_table'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'in_table'}{'contents'}[1];
 $result_trees{'in_table'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'in_table'}{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'args'}[0];
@@ -1136,7 +1132,6 @@ 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[4]{'args'}[0
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[4];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'contents'}[4];
 $result_trees{'in_table'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'in_table'}{'contents'}[1];
 $result_trees{'in_table'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'in_table'}{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'args'}[0];
@@ -1189,7 +1184,6 @@ 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
 $result_trees{'in_table'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'in_table'}{'contents'}[1];
 $result_trees{'in_table'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'in_table'}{'contents'}[1];
 
$result_trees{'in_table'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'in_table'}{'contents'}[1]{'contents'}[7]{'args'}[0];
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl 
b/tp/t/results/invalid_nestings/item_in_ref.pl
index 2e9d4e4a42..f200b20292 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -217,7 +217,6 @@ $result_trees{'item_in_ref'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -261,7 +260,6 @@ 
$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'
 
$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'item_in_ref'}{'contents'}[0];
 $result_trees{'item_in_ref'}{'contents'}[0]{'parent'} = 
$result_trees{'item_in_ref'};
 
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 7c96fbd4e1..83317d6e32 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
@@ -176,8 +176,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                         }
                       ],
                       'extra' => {
-                        'command_as_argument' => {},
-                        'end_command' => {}
+                        'command_as_argument' => {}
                       },
                       'parent' => {},
                       'source_info' => {
@@ -271,7 +270,6 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                         }
                       ],
                       'extra' => {
-                        'end_command' => {},
                         'enumerate_specification' => '1'
                       },
                       'parent' => {},
@@ -327,7 +325,6 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -363,7 +360,6 @@ 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4];
@@ -374,7 +370,6 @@ 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -383,7 +378,6 @@ 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];
 $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'parent'} 
= $result_trees{'itemx_in_itemize_enumerate_in_table'};
 
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 92a4a120e0..42c8b148d1 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -174,9 +174,6 @@ $result_trees{'menu_in_style_command'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -234,7 +231,6 @@ 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}
 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2];
-$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
 $result_trees{'menu_in_style_command'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'menu_in_style_command'}{'contents'}[1];
 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'menu_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -259,8 +255,7 @@ $result_nodes{'menu_in_style_command'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 d737074b14..a9f2ef833e 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -179,7 +179,6 @@ $result_trees{'multitable_in_style_command'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -233,7 +232,6 @@ 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'cont
 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_in_style_command'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'multitable_in_style_command'}{'contents'}[0];
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 c0bc1452ff..6a7c085b41 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -130,7 +130,6 @@ $result_trees{'multitable_item_in_index'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -179,7 +178,6 @@ 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'multitable_item_in_index'}{'contents'}[0];
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 4c1a8a9d84..ca04adb10b 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -172,7 +172,6 @@ $result_trees{'on_block_command_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -370,7 +369,6 @@ $result_trees{'on_block_command_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -407,7 +405,6 @@ 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'on_block_command_line'}{'contents'}[0];
 $result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'on_block_command_line'}{'contents'}[0];
@@ -434,7 +431,6 @@ 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'on_block_command_line'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'on_block_command_line'}{'contents'}[0];
 $result_trees{'on_block_command_line'}{'contents'}[0]{'parent'} = 
$result_trees{'on_block_command_line'};
 
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index 6ca925c732..af76165e4f 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -427,7 +427,6 @@ $result_trees{'on_def_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -497,7 +496,6 @@ 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'paren
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'on_def_line'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'on_def_line'}{'contents'}[0];
 $result_trees{'on_def_line'}{'contents'}[0]{'parent'} = 
$result_trees{'on_def_line'};
 
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index 8fee3dd6f8..7021f3b4ae 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -208,7 +208,6 @@ $result_trees{'on_itemize_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -283,7 +282,6 @@ $result_trees{'on_itemize_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -326,7 +324,6 @@ 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'p
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'on_itemize_line'}{'contents'}[0];
 $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'on_itemize_line'}{'contents'}[0];
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -336,7 +333,6 @@ 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'paren
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'on_itemize_line'}{'contents'}[0];
 $result_trees{'on_itemize_line'}{'contents'}[0]{'parent'} = 
$result_trees{'on_itemize_line'};
 
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index d85c7908e7..db286891cd 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -129,9 +129,6 @@ $result_trees{'quotation_in_ref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -191,7 +188,6 @@ 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'
 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2];
-$result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
 $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'quotation_in_ref'}{'contents'}[1];
 
$result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[3];
 $result_trees{'quotation_in_ref'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'quotation_in_ref'}{'contents'}[1];
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 7537e87c10..27e708c392 100644
--- a/tp/t/results/invalid_nestings/quotation_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
@@ -93,9 +93,6 @@ $result_trees{'quotation_in_style_command'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -120,7 +117,6 @@ 
$result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1]{'conte
 
$result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1];
-$result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'quotation_in_style_command'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_in_style_command'}{'contents'}[0];
 $result_trees{'quotation_in_style_command'}{'contents'}[0]{'parent'} = 
$result_trees{'quotation_in_style_command'};
 
diff --git a/tp/t/results/invalid_nestings/recursive_copying.pl 
b/tp/t/results/invalid_nestings/recursive_copying.pl
index ce5afe82ec..6f91b0275c 100644
--- a/tp/t/results/invalid_nestings/recursive_copying.pl
+++ b/tp/t/results/invalid_nestings/recursive_copying.pl
@@ -76,9 +76,6 @@ $result_trees{'recursive_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -124,7 +121,6 @@ 
$result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{
 
$result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0];
-$result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'recursive_copying'}{'contents'}[0];
 $result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'recursive_copying'}{'contents'}[0];
 
$result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'recursive_copying'}{'contents'}[0]{'contents'}[2];
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 0409651931..fb36ec9b98 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
@@ -86,9 +86,6 @@ $result_trees{'style_not_closed_in_block_command'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -112,7 +109,6 @@ 
$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'style_not_closed_in_block_command'}{'contents'}[0];
 $result_trees{'style_not_closed_in_block_command'}{'contents'}[0]{'parent'} = 
$result_trees{'style_not_closed_in_block_command'};
 
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 6a90553c75..64c6346279 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
@@ -190,7 +190,6 @@ $result_trees{'style_not_closed_in_table_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -230,7 +229,6 @@ 
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'style_not_closed_in_table_line'}{'contents'}[0];
 $result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'parent'} = 
$result_trees{'style_not_closed_in_table_line'};
 
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 86587f81f9..04e6f04e07 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
@@ -179,9 +179,6 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -379,7 +376,6 @@ 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'conte
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -490,8 +486,7 @@ $result_nodes{'style_not_closed_no_newline_root_commands'} 
= {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 7be35d394f..5e83200a8e 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
@@ -179,9 +179,6 @@ $result_trees{'style_not_closed_root_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -391,7 +388,6 @@ 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'c
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1];
-$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'style_not_closed_root_commands'}{'contents'}[2];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'style_not_closed_root_commands'}{'contents'}[2];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -508,8 +504,7 @@ $result_nodes{'style_not_closed_root_commands'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl 
b/tp/t/results/invalid_nestings/tab_in_index.pl
index 8a50fe96ba..6b29216675 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -194,7 +194,6 @@ $result_trees{'tab_in_index'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -251,7 +250,6 @@ 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'pare
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0];
-$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'tab_in_index'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'tab_in_index'}{'contents'}[0];
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl 
b/tp/t/results/invalid_nestings/table_in_code.pl
index 8d431dacb3..a4d71751fe 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -158,7 +158,6 @@ $result_trees{'table_in_code'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -199,7 +198,6 @@ 
$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'arg
 
$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'table_in_code'}{'contents'}[0];
 $result_trees{'table_in_code'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'table_in_code'}{'contents'}[0];
 $result_trees{'table_in_code'}{'contents'}[0]{'parent'} = 
$result_trees{'table_in_code'};
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 54a0a6753f..104876fb9e 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
@@ -235,9 +235,6 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -284,7 +281,6 @@ 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
 $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'table_not_closed_in_menu_comment'};
 
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 8a755cc397..679559af0e 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
@@ -211,9 +211,6 @@ $result_trees{'table_not_closed_in_menu_description'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -256,7 +253,6 @@ 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}
 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0];
 $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'parent'} 
= $result_trees{'table_not_closed_in_menu_description'};
 
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 179b82e594..0a633cdbf8 100644
--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
@@ -223,7 +223,6 @@ $result_trees{'table_on_item_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -279,7 +278,6 @@ 
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]
 
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'table_on_item_line'}{'contents'}[0];
 
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[1];
 $result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'table_on_item_line'}{'contents'}[0];
diff --git a/tp/t/results/itemize/accent_argument.pl 
b/tp/t/results/itemize/accent_argument.pl
index 408657213f..158cdc3f32 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -95,7 +95,6 @@ $result_trees{'accent_argument'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -205,7 +204,6 @@ $result_trees{'accent_argument'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -231,7 +229,6 @@ 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'p
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0];
-$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'accent_argument'}{'contents'}[0];
 $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'accent_argument'}{'contents'}[0];
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -244,7 +241,6 @@ 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'p
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2];
-$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'accent_argument'}{'contents'}[0];
 $result_trees{'accent_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'accent_argument'};
 
diff --git a/tp/t/results/itemize/asis_as_itemize_argument.pl 
b/tp/t/results/itemize/asis_as_itemize_argument.pl
index 344291044d..852dc56187 100644
--- a/tp/t/results/itemize/asis_as_itemize_argument.pl
+++ b/tp/t/results/itemize/asis_as_itemize_argument.pl
@@ -93,7 +93,6 @@ $result_trees{'asis_as_itemize_argument'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -119,7 +118,6 @@ 
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'asis_as_itemize_argument'}{'contents'}[0];
 $result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'asis_as_itemize_argument'};
 
diff --git a/tp/t/results/itemize/bad_enumerate_arguments.pl 
b/tp/t/results/itemize/bad_enumerate_arguments.pl
index 00b7d76313..0d54d98698 100644
--- a/tp/t/results/itemize/bad_enumerate_arguments.pl
+++ b/tp/t/results/itemize/bad_enumerate_arguments.pl
@@ -59,7 +59,6 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -126,7 +125,6 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -211,7 +209,6 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -282,7 +279,6 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'a',
             'spaces_before_argument' => ' '
           },
@@ -349,7 +345,6 @@ $result_trees{'bad_enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -372,7 +367,6 @@ 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'args'}[0
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0];
-$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -380,7 +374,6 @@ 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'args'}[0
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2];
-$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -390,7 +383,6 @@ 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'args'}[0
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4];
-$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
@@ -399,7 +391,6 @@ 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6];
-$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0];
@@ -407,7 +398,6 @@ 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'args'}[0
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8];
-$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
 
$result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'bad_enumerate_arguments'}{'contents'}[0];
 $result_trees{'bad_enumerate_arguments'}{'contents'}[0]{'parent'} = 
$result_trees{'bad_enumerate_arguments'};
 
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 6627730716..641acabb68 100644
--- a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
+++ b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
@@ -96,7 +96,6 @@ $result_trees{'comment_first_on_enumerate_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -123,7 +122,6 @@ 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_first_on_enumerate_line'}{'contents'}[0];
 $result_trees{'comment_first_on_enumerate_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_first_on_enumerate_line'};
 
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 5cba380cf8..c2329c1c2c 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -104,7 +104,6 @@ $result_trees{'comment_first_on_itemize_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -132,7 +131,6 @@ 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_first_on_itemize_line'}{'contents'}[0];
 $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_first_on_itemize_line'};
 
diff --git a/tp/t/results/itemize/empty_accent_argument.pl 
b/tp/t/results/itemize/empty_accent_argument.pl
index 604b902440..c133f4103d 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -108,7 +108,6 @@ $result_trees{'empty_accent_argument'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -207,7 +206,6 @@ $result_trees{'empty_accent_argument'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -313,7 +311,6 @@ $result_trees{'empty_accent_argument'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -340,7 +337,6 @@ 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'empty_accent_argument'}{'contents'}[0];
 $result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'empty_accent_argument'}{'contents'}[0];
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -351,7 +347,6 @@ 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'empty_accent_argument'}{'contents'}[0];
 $result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'empty_accent_argument'}{'contents'}[0];
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -363,7 +358,6 @@ 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'contents'}
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4];
-$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'empty_accent_argument'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'empty_accent_argument'}{'contents'}[0];
 $result_trees{'empty_accent_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_accent_argument'};
 
diff --git a/tp/t/results/itemize/enumerate_and_empty_lines.pl 
b/tp/t/results/itemize/enumerate_and_empty_lines.pl
index 2bceea34ad..7af47f9d77 100644
--- a/tp/t/results/itemize/enumerate_and_empty_lines.pl
+++ b/tp/t/results/itemize/enumerate_and_empty_lines.pl
@@ -127,9 +127,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -261,9 +258,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -349,9 +343,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -449,9 +440,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -501,7 +489,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -588,7 +575,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -619,7 +605,6 @@ 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
@@ -637,7 +622,6 @@ 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
@@ -648,7 +632,6 @@ 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
@@ -661,13 +644,11 @@ 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2];
@@ -677,7 +658,6 @@ 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'conten
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_and_empty_lines'}{'contents'}[0];
 $result_trees{'enumerate_and_empty_lines'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_and_empty_lines'};
 
diff --git a/tp/t/results/itemize/enumerate_argument.pl 
b/tp/t/results/itemize/enumerate_argument.pl
index 4af905c976..ed190866be 100644
--- a/tp/t/results/itemize/enumerate_argument.pl
+++ b/tp/t/results/itemize/enumerate_argument.pl
@@ -59,7 +59,6 @@ $result_trees{'enumerate_argument'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -142,7 +141,6 @@ $result_trees{'enumerate_argument'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'A',
             'spaces_before_argument' => ' '
           },
@@ -226,7 +224,6 @@ $result_trees{'enumerate_argument'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'z',
             'spaces_before_argument' => ' '
           },
@@ -249,7 +246,6 @@ 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'pa
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_argument'}{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'enumerate_argument'}{'contents'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -259,7 +255,6 @@ 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'pa
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2];
-$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'enumerate_argument'}{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'enumerate_argument'}{'contents'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -269,7 +264,6 @@ 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'pa
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4];
-$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'enumerate_argument'}{'contents'}[0];
 $result_trees{'enumerate_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_argument'};
 
diff --git a/tp/t/results/itemize/enumerate_argument_item.pl 
b/tp/t/results/itemize/enumerate_argument_item.pl
index b07ec6a105..d14f212bfc 100644
--- a/tp/t/results/itemize/enumerate_argument_item.pl
+++ b/tp/t/results/itemize/enumerate_argument_item.pl
@@ -111,7 +111,6 @@ $result_trees{'enumerate_argument_item'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -246,7 +245,6 @@ $result_trees{'enumerate_argument_item'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'A',
             'spaces_before_argument' => ' '
           },
@@ -382,7 +380,6 @@ $result_trees{'enumerate_argument_item'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'z',
             'spaces_before_argument' => ' '
           },
@@ -411,7 +408,6 @@ 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -427,7 +423,6 @@ 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2];
-$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -443,7 +438,6 @@ 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'contents
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4];
-$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'enumerate_argument_item'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'enumerate_argument_item'}{'contents'}[0];
 $result_trees{'enumerate_argument_item'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_argument_item'};
 
diff --git a/tp/t/results/itemize/enumerate_in_example.pl 
b/tp/t/results/itemize/enumerate_in_example.pl
index 489e924672..6c99b9ef55 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -137,7 +137,6 @@ $result_trees{'enumerate_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'enumerate_specification' => '1'
               },
               'parent' => {},
@@ -177,9 +176,6 @@ $result_trees{'enumerate_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -208,12 +204,10 @@ 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[
 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'enumerate_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'enumerate_in_example'}{'contents'}[0];
 $result_trees{'enumerate_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_in_example'};
 
diff --git a/tp/t/results/itemize/enumerate_letters.pl 
b/tp/t/results/itemize/enumerate_letters.pl
index 09a4905518..8d34433cf7 100644
--- a/tp/t/results/itemize/enumerate_letters.pl
+++ b/tp/t/results/itemize/enumerate_letters.pl
@@ -5415,7 +5415,6 @@ $result_trees{'enumerate_letters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'c',
             'spaces_before_argument' => ' '
           },
@@ -6056,7 +6055,6 @@ 
$result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0]{'contents'}[205
 
$result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0]{'contents'}[206]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0]{'contents'}[206]{'args'}[0];
 
$result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0]{'contents'}[206]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0]{'contents'}[206];
 
$result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0]{'contents'}[206]{'parent'}
 = $result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0];
-$result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0]{'contents'}[206];
 $result_trees{'enumerate_letters'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_letters'}{'contents'}[0];
 $result_trees{'enumerate_letters'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_letters'};
 
diff --git a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl 
b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
index b77f171c64..a9804d31d0 100644
--- a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
@@ -124,7 +124,6 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -154,7 +153,6 @@ 
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0];
-$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0];
 $result_trees{'headitem_itemx_in_enumerate'}{'contents'}[0]{'parent'} = 
$result_trees{'headitem_itemx_in_enumerate'};
 
diff --git a/tp/t/results/itemize/headitem_itemx_in_itemize.pl 
b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
index c4b268798e..5595e5f33f 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -131,8 +131,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -163,7 +162,6 @@ 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
 $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'headitem_itemx_in_itemize'};
 
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 2d1b423c47..fe27516714 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -262,7 +262,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -408,7 +407,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -548,7 +546,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -688,7 +685,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -833,7 +829,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -1067,7 +1062,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -1127,7 +1121,6 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1]{
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3];
@@ -1147,7 +1140,6 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5];
@@ -1166,7 +1158,6 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7];
@@ -1185,7 +1176,6 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[8]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9];
@@ -1205,7 +1195,6 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[10]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11];
@@ -1239,7 +1228,6 @@ 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[12]{'parent'}
 = $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4];
 $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'parent'} = 
$result_trees{'inter_item_commands_in_enumerate'};
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 29ba443509..81ef8e695b 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -310,7 +310,6 @@ $result_trees{'inter_item_commands_in_itemize'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -532,7 +531,6 @@ $result_trees{'inter_item_commands_in_itemize'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -702,8 +700,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -764,7 +761,6 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'c
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'args'}[0];
@@ -796,7 +792,6 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'c
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0];
@@ -820,7 +815,6 @@ 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'c
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
 $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'parent'} = 
$result_trees{'inter_item_commands_in_itemize'};
 
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl 
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index fc4ae84541..be41d46155 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -132,9 +132,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -266,9 +263,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -331,9 +325,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -431,9 +422,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -483,7 +471,6 @@ $result_trees{'itemize_and_empty_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -624,9 +611,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -758,9 +742,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -846,9 +827,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -946,9 +924,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -998,8 +973,7 @@ $result_trees{'itemize_and_empty_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -1114,7 +1088,6 @@ $result_trees{'itemize_and_empty_lines'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1287,7 +1260,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                   ],
                   'extra' => {
                     'command_as_argument' => {},
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1352,7 +1324,6 @@ $result_trees{'itemize_and_empty_lines'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1520,7 +1491,6 @@ $result_trees{'itemize_and_empty_lines'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1552,7 +1522,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
@@ -1570,7 +1539,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[0];
@@ -1578,7 +1546,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[4]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0];
@@ -1591,13 +1558,11 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -1615,7 +1580,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
@@ -1633,7 +1597,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
@@ -1644,7 +1607,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
@@ -1657,14 +1619,12 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[6];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[6];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[4];
@@ -1679,7 +1639,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'contents
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
@@ -1701,7 +1660,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'content
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
@@ -1710,7 +1668,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'content
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
@@ -1731,7 +1688,6 @@ 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'content
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[3];
 
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'itemize_and_empty_lines'}{'contents'}[0];
 $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'parent'} = 
$result_trees{'itemize_and_empty_lines'};
 
diff --git a/tp/t/results/itemize/itemize_in_example.pl 
b/tp/t/results/itemize/itemize_in_example.pl
index 59cbb0040d..7888feb942 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -118,7 +118,6 @@ $result_trees{'itemize_in_example'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -224,7 +223,6 @@ $result_trees{'itemize_in_example'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -322,7 +320,6 @@ $result_trees{'itemize_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -420,7 +417,6 @@ $result_trees{'itemize_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -535,7 +531,6 @@ $result_trees{'itemize_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -575,9 +570,6 @@ $result_trees{'itemize_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -604,7 +596,6 @@ 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
@@ -617,7 +608,6 @@ 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
@@ -629,7 +619,6 @@ 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
@@ -641,7 +630,6 @@ 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
@@ -655,12 +643,10 @@ 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9];
 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9];
 $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'itemize_in_example'}{'contents'}[0];
 $result_trees{'itemize_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'itemize_in_example'};
 
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 6784288811..71de69a508 100644
--- a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
+++ b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
@@ -100,7 +100,6 @@ $result_trees{'itemize_line_commands_with_brace'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -207,7 +206,6 @@ $result_trees{'itemize_line_commands_with_brace'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -234,7 +232,6 @@ 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0];
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0];
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -247,7 +244,6 @@ 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0];
 $result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'parent'} = 
$result_trees{'itemize_line_commands_with_brace'};
 
diff --git a/tp/t/results/itemize/itemize_long_item.pl 
b/tp/t/results/itemize/itemize_long_item.pl
index 19739a0a73..82dc2fd438 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -132,9 +132,6 @@ $result_trees{'itemize_long_item'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -266,9 +263,6 @@ $result_trees{'itemize_long_item'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -354,9 +348,6 @@ $result_trees{'itemize_long_item'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -454,9 +445,6 @@ $result_trees{'itemize_long_item'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -506,7 +494,6 @@ $result_trees{'itemize_long_item'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -538,7 +525,6 @@ 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
@@ -556,7 +542,6 @@ 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
@@ -567,7 +552,6 @@ 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
@@ -580,13 +564,11 @@ 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 $result_trees{'itemize_long_item'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'itemize_long_item'}{'contents'}[0];
 $result_trees{'itemize_long_item'}{'contents'}[0]{'parent'} = 
$result_trees{'itemize_long_item'};
 
diff --git a/tp/t/results/itemize/table_in_itemize.pl 
b/tp/t/results/itemize/table_in_itemize.pl
index 20ac040617..25c79cdfad 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -279,7 +279,6 @@ $result_trees{'table_in_itemize'} = {
                   ],
                   'extra' => {
                     'command_as_argument' => {},
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -354,7 +353,6 @@ $result_trees{'table_in_itemize'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -406,7 +404,6 @@ 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
@@ -416,7 +413,6 @@ 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'table_in_itemize'}{'contents'}[0];
 $result_trees{'table_in_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'table_in_itemize'};
 
diff --git a/tp/t/results/itemize/w_argument.pl 
b/tp/t/results/itemize/w_argument.pl
index 857b3ed78d..3eefd5ee49 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -170,7 +170,6 @@ $result_trees{'w_argument'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -206,7 +205,6 @@ 
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}
 
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'w_argument'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'w_argument'}{'contents'}[0];
 $result_trees{'w_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'w_argument'};
 
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index 6e081b42be..c8c32d3092 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -248,7 +248,6 @@ $result_trees{'multiple'} = {
                     }
                   ],
                   'extra' => {
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -288,9 +287,6 @@ $result_trees{'multiple'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -644,7 +640,6 @@ $result_trees{'multiple'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -941,7 +936,6 @@ $result_trees{'multiple'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1056,12 +1050,10 @@ 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'multiple'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'multiple'}{'contents'}[0]{'contents'}[0];
 $result_trees{'multiple'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'multiple'}{'contents'}[0];
@@ -1109,7 +1101,6 @@ 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[1];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 $result_trees{'multiple'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'multiple'}{'contents'}[4];
 $result_trees{'multiple'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'multiple'}{'contents'}[4];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[3]{'args'}[0];
@@ -1149,7 +1140,6 @@ 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'parent'}
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[9];
-$result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = $result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 $result_trees{'multiple'}{'contents'}[4]{'contents'}[9]{'parent'} = 
$result_trees{'multiple'}{'contents'}[4];
 $result_trees{'multiple'}{'contents'}[4]{'contents'}[10]{'parent'} = 
$result_trees{'multiple'}{'contents'}[4];
 $result_trees{'multiple'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'parent'} 
= $result_trees{'multiple'}{'contents'}[4]{'contents'}[11];
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 65d39157d3..e3ed2683ea 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -248,7 +248,6 @@ $result_trees{'multiple_in_preamble'} = {
                     }
                   ],
                   'extra' => {
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -288,9 +287,6 @@ $result_trees{'multiple_in_preamble'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -678,7 +674,6 @@ $result_trees{'multiple_in_preamble'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -883,7 +878,6 @@ $result_trees{'multiple_in_preamble'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -938,12 +932,10 @@ 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -995,7 +987,6 @@ 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 $result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'multiple_in_preamble'}{'contents'}[4];
 $result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[2]{'parent'} 
= $result_trees{'multiple_in_preamble'}{'contents'}[4];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[3]{'args'}[0];
@@ -1023,7 +1014,6 @@ 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5];
-$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
 $result_trees{'multiple_in_preamble'}{'contents'}[4]{'contents'}[5]{'parent'} 
= $result_trees{'multiple_in_preamble'}{'contents'}[4];
 $result_trees{'multiple_in_preamble'}{'contents'}[4]{'parent'} = 
$result_trees{'multiple_in_preamble'};
 
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 4f1c5ad9b3..9a094af12b 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -248,7 +248,6 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                     }
                   ],
                   'extra' => {
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -288,9 +287,6 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -730,7 +726,6 @@ $result_trees{'multiple_in_preamble_before_node'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -785,12 +780,10 @@ 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -849,7 +842,6 @@ 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1];
-$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_in_preamble_before_node'}{'contents'}[4];
 $result_trees{'multiple_in_preamble_before_node'}{'contents'}[4]{'parent'} = 
$result_trees{'multiple_in_preamble_before_node'};
 
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index a5d53c3791..16d371c1c8 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -533,9 +533,6 @@ $result_trees{'multiple_lang_chapters'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -855,7 +852,6 @@ $result_trees{'multiple_lang_chapters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1177,7 +1173,6 @@ $result_trees{'multiple_lang_chapters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1453,7 +1448,6 @@ $result_trees{'multiple_lang_chapters'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1818,7 +1812,6 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1];
-$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'multiple_lang_chapters'}{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'multiple_lang_chapters'}{'contents'}[2];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -1862,7 +1855,6 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2];
-$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[2]{'parent'} 
= $result_trees{'multiple_lang_chapters'}{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[3]{'parent'} 
= $result_trees{'multiple_lang_chapters'}{'contents'}[4];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[4]{'contents'}[4]{'args'}[0];
@@ -1906,7 +1898,6 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2];
-$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[2]{'parent'} 
= $result_trees{'multiple_lang_chapters'}{'contents'}[6];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[3]{'parent'} 
= $result_trees{'multiple_lang_chapters'}{'contents'}[6];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[6]{'contents'}[4]{'args'}[0];
@@ -1942,7 +1933,6 @@ 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1];
-$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[1]{'parent'} 
= $result_trees{'multiple_lang_chapters'}{'contents'}[8];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[2]{'parent'} 
= $result_trees{'multiple_lang_chapters'}{'contents'}[8];
 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters'}{'contents'}[8]{'contents'}[3]{'args'}[0];
@@ -2223,8 +2213,7 @@ $result_nodes{'multiple_lang_chapters'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index c69b5866b5..4a023c4d93 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -533,9 +533,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -855,7 +852,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1177,7 +1173,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1453,7 +1448,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1818,7 +1812,6 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -1862,7 +1855,6 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[4]{'contents'}[4]{'args'}[0];
@@ -1906,7 +1898,6 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[6];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[6];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[6]{'contents'}[4]{'args'}[0];
@@ -1942,7 +1933,6 @@ 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'con
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1];
-$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[8];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_lang_chapters_latex'}{'contents'}[8];
 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_latex'}{'contents'}[8]{'contents'}[3]{'args'}[0];
@@ -2223,8 +2213,7 @@ $result_nodes{'multiple_lang_chapters_latex'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index cdaef561ee..06e7ece18a 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -504,9 +504,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -826,7 +823,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1148,7 +1144,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1424,7 +1419,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1786,7 +1780,6 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -1830,7 +1823,6 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[4]{'contents'}[4]{'args'}[0];
@@ -1874,7 +1866,6 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[3]{'parent'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[6]{'contents'}[4]{'args'}[0];
@@ -1910,7 +1901,6 @@ 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1];
-$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8];
 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_lang_chapters_texi2html'}{'contents'}[8]{'contents'}[3]{'args'}[0];
@@ -2190,8 +2180,7 @@ $result_nodes{'multiple_lang_chapters_texi2html'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/languages/simple.pl b/tp/t/results/languages/simple.pl
index 5899bca85f..251076be11 100644
--- a/tp/t/results/languages/simple.pl
+++ b/tp/t/results/languages/simple.pl
@@ -233,7 +233,6 @@ $result_trees{'simple'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -299,7 +298,6 @@ 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'} =
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'simple'}{'contents'}[1]{'contents'}[1];
-$result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'} 
= $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'simple'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'simple'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'simple'}{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 8f93954934..cd7b836dcf 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -233,7 +233,6 @@ $result_trees{'unknown_region'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -299,7 +298,6 @@ 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'pa
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1];
-$result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'unknown_region'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'unknown_region'}{'contents'}[1];
 $result_trees{'unknown_region'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'unknown_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_region'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'unknown_region'}{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl 
b/tp/t/results/latex_tests/anchor_in_copying.pl
index 515ae4661e..c91074f501 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -101,9 +101,6 @@ $result_trees{'anchor_in_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -336,7 +333,6 @@ 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0];
 $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'anchor_in_copying'}{'contents'}[0];
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 cc8e085789..e1991e7e5a 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
@@ -101,9 +101,6 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -407,7 +404,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_in_copying_insertcopying_chap'}{'contents'}[0];
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 a018623e52..5cfe85af65 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
@@ -101,9 +101,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -261,9 +258,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -532,7 +526,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'conte
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
@@ -553,7 +546,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'conte
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6]{'args'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[6];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_in_copying_insertcopying_titlepage'}{'contents'}[0];
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 ca21c45417..8f9c1f54d5 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
@@ -101,9 +101,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -224,9 +221,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -530,7 +524,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
@@ -545,7 +538,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'}{'contents'}[0];
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index eb4023ee44..1c6bea0ef2 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -127,9 +127,6 @@ $result_trees{'brace_in_index'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -490,7 +487,6 @@ $result_trees{'brace_in_index'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -524,7 +520,6 @@ 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'pa
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[7]{'args'}[0];
@@ -577,7 +572,6 @@ 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'p
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[2]{'args'}[0];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[2];
 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13];
-$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'contents'}[2];
 $result_trees{'brace_in_index'}{'contents'}[0]{'contents'}[13]{'parent'} = 
$result_trees{'brace_in_index'}{'contents'}[0];
 $result_trees{'brace_in_index'}{'contents'}[0]{'parent'} = 
$result_trees{'brace_in_index'};
 
diff --git a/tp/t/results/latex_tests/enumerate_arguments.pl 
b/tp/t/results/latex_tests/enumerate_arguments.pl
index 457cb84439..19d8e06f9b 100644
--- a/tp/t/results/latex_tests/enumerate_arguments.pl
+++ b/tp/t/results/latex_tests/enumerate_arguments.pl
@@ -116,7 +116,6 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'a',
             'spaces_before_argument' => ' '
           },
@@ -235,7 +234,6 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'A',
             'spaces_before_argument' => ' '
           },
@@ -354,7 +352,6 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'c',
             'spaces_before_argument' => ' '
           },
@@ -473,7 +470,6 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'C',
             'spaces_before_argument' => ' '
           },
@@ -592,7 +588,6 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -711,7 +706,6 @@ $result_trees{'enumerate_arguments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '3',
             'spaces_before_argument' => ' '
           },
@@ -747,7 +741,6 @@ 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[1
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1];
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -761,7 +754,6 @@ 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[1
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3];
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'args'}[0];
@@ -775,7 +767,6 @@ 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[1
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5];
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'args'}[0];
@@ -789,7 +780,6 @@ 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[1
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[2];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7];
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'contents'}[2];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'args'}[0];
@@ -803,7 +793,6 @@ 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[1
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[2];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9];
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'contents'}[2];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'enumerate_arguments'}{'contents'}[0];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[10]{'parent'} 
= $result_trees{'enumerate_arguments'}{'contents'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'args'}[0];
@@ -817,7 +806,6 @@ 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[2];
 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11];
-$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'contents'}[2];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[11]{'parent'} 
= $result_trees{'enumerate_arguments'}{'contents'}[0];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'contents'}[12]{'parent'} 
= $result_trees{'enumerate_arguments'}{'contents'}[0];
 $result_trees{'enumerate_arguments'}{'contents'}[0]{'parent'} = 
$result_trees{'enumerate_arguments'};
diff --git a/tp/t/results/latex_tests/example_in_cartouche.pl 
b/tp/t/results/latex_tests/example_in_cartouche.pl
index b09c8d49d2..c861e7a9ea 100644
--- a/tp/t/results/latex_tests/example_in_cartouche.pl
+++ b/tp/t/results/latex_tests/example_in_cartouche.pl
@@ -86,9 +86,6 @@ $result_trees{'example_in_cartouche'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -176,9 +173,6 @@ $result_trees{'example_in_cartouche'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -216,9 +210,6 @@ $result_trees{'example_in_cartouche'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -243,7 +234,6 @@ 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1];
-$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'example_in_cartouche'}{'contents'}[0];
 $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'example_in_cartouche'}{'contents'}[0];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3];
@@ -254,12 +244,10 @@ 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3];
-$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'example_in_cartouche'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'example_in_cartouche'}{'contents'}[0];
 $result_trees{'example_in_cartouche'}{'contents'}[0]{'parent'} = 
$result_trees{'example_in_cartouche'};
 
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index 8a625fb329..684c8b383b 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -301,7 +301,6 @@ $result_trees{'float_and_refs'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -471,7 +470,6 @@ $result_trees{'float_and_refs'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -644,7 +642,6 @@ $result_trees{'float_and_refs'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -1851,7 +1848,6 @@ 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[5]{'ar
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[5];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[5];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
@@ -1879,7 +1875,6 @@ 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[5]{'ar
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[5];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[5]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[5];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
@@ -1908,7 +1903,6 @@ 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'ar
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[5];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[5]{'parent'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'caption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[1];
-$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[5];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'float_section'}
 = $result_trees{'float_and_refs'}{'contents'}[4];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'extra'}{'shortcaption'}
 = $result_trees{'float_and_refs'}{'contents'}[4]{'contents'}[5]{'contents'}[3];
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl 
b/tp/t/results/latex_tests/nested_enumerate.pl
index e558dd641a..f986e1e11a 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -333,7 +333,6 @@ $result_trees{'nested_enumerate'} = {
                                     }
                                   ],
                                   'extra' => {
-                                    'end_command' => {},
                                     'enumerate_specification' => '1'
                                   },
                                   'parent' => {},
@@ -386,7 +385,6 @@ $result_trees{'nested_enumerate'} = {
                             }
                           ],
                           'extra' => {
-                            'end_command' => {},
                             'enumerate_specification' => '1'
                           },
                           'parent' => {},
@@ -439,7 +437,6 @@ $result_trees{'nested_enumerate'} = {
                     }
                   ],
                   'extra' => {
-                    'end_command' => {},
                     'enumerate_specification' => '1'
                   },
                   'parent' => {},
@@ -492,7 +489,6 @@ $result_trees{'nested_enumerate'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -556,25 +552,21 @@ 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 $result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_enumerate'}{'contents'}[0];
 $result_trees{'nested_enumerate'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_enumerate'}{'contents'}[0];
 $result_trees{'nested_enumerate'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_enumerate'};
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index f7c3c5ffaf..6118fb0969 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -361,8 +361,7 @@ $result_trees{'nested_itemize'} = {
                                     }
                                   ],
                                   'extra' => {
-                                    'command_as_argument' => {},
-                                    'end_command' => {}
+                                    'command_as_argument' => {}
                                   },
                                   'parent' => {},
                                   'source_info' => {
@@ -414,8 +413,7 @@ $result_trees{'nested_itemize'} = {
                             }
                           ],
                           'extra' => {
-                            'command_as_argument' => {},
-                            'end_command' => {}
+                            'command_as_argument' => {}
                           },
                           'parent' => {},
                           'source_info' => {
@@ -467,8 +465,7 @@ $result_trees{'nested_itemize'} = {
                     }
                   ],
                   'extra' => {
-                    'command_as_argument' => {},
-                    'end_command' => {}
+                    'command_as_argument' => {}
                   },
                   'parent' => {},
                   'source_info' => {
@@ -520,8 +517,7 @@ $result_trees{'nested_itemize'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -589,28 +585,24 @@ 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'co
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_itemize'}{'contents'}[0];
 $result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_itemize'}{'contents'}[0];
 $result_trees{'nested_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_itemize'};
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 5c15ec1e19..7315ee6930 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -140,9 +140,6 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -175,7 +172,6 @@ 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0];
 $result_trees{'setchapternewpage_on_odd_titlepage'}{'contents'}[0]{'parent'} = 
$result_trees{'setchapternewpage_on_odd_titlepage'};
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl 
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index 6d0c6164d9..2959d277dd 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -66,9 +66,6 @@ $result_trees{'titlepage_and_headings'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -99,7 +96,6 @@ 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_headings'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'titlepage_and_headings'}{'contents'}[0];
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 7c03fef027..205552d39b 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -103,9 +103,6 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -140,7 +137,6 @@ 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_and_setchapternewpage_odd'}{'contents'}[0];
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 cd9efbde71..ced997ca82 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -103,9 +103,6 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -140,7 +137,6 @@ 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_and_setchapternewpage_on'}{'contents'}[0];
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 2837e83aa8..eac2f7c70f 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -66,9 +66,6 @@ $result_trees{'titlepage_classical'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -351,9 +348,6 @@ $result_trees{'titlepage_classical'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -555,7 +549,6 @@ 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
@@ -590,7 +583,6 @@ 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11]{'args'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11]{'parent'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[11];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0];
 $result_trees{'titlepage_classical'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_classical'}{'contents'}[0];
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 0925cc3f15..2e5fb76eb3 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -173,9 +173,6 @@ $result_trees{'titlepage_in_top_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -311,7 +308,6 @@ 
$result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3]{'contents'}
 
$result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'titlepage_in_top_node'}{'contents'}[2];
 $result_trees{'titlepage_in_top_node'}{'contents'}[2]{'contents'}[4]{'parent'} 
= $result_trees{'titlepage_in_top_node'}{'contents'}[2];
 $result_trees{'titlepage_in_top_node'}{'contents'}[2]{'parent'} = 
$result_trees{'titlepage_in_top_node'};
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 7b7a04c6e4..5f96d6201d 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -97,9 +97,6 @@ $result_trees{'titlepage_long_title'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -299,7 +296,6 @@ 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0];
 $result_trees{'titlepage_long_title'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'titlepage_long_title'}{'contents'}[0];
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index 2460d7813e..c36a215691 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -83,9 +83,6 @@ $result_trees{'titlepage_no_author'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -282,7 +279,6 @@ 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0];
 $result_trees{'titlepage_no_author'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_no_author'}{'contents'}[0];
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index 9dccfd047b..1f7db8c23c 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -117,9 +117,6 @@ $result_trees{'titlepage_no_title'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -322,7 +319,6 @@ 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]
 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0];
 $result_trees{'titlepage_no_title'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'titlepage_no_title'}{'contents'}[0];
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 efd356c104..edfae7b83f 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -66,9 +66,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -377,9 +374,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                       }
                                     }
                                   ],
-                                  'extra' => {
-                                    'end_command' => {}
-                                  },
                                   'parent' => {},
                                   'source_info' => {
                                     'file_name' => '',
@@ -529,9 +523,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -733,7 +724,6 @@ 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
@@ -777,7 +767,6 @@ 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'}[4];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[4]{'args'}[0];
@@ -797,7 +786,6 @@ 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'args'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[10];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'titlepage_with_commands_classical'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'titlepage_with_commands_classical'}{'contents'}[0];
diff --git a/tp/t/results/latex_tests/verbatim_in_smallformat.pl 
b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
index e949da6b58..b2b4a55f3b 100644
--- a/tp/t/results/latex_tests/verbatim_in_smallformat.pl
+++ b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
@@ -90,9 +90,6 @@ $result_trees{'verbatim_in_smallformat'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -117,7 +114,6 @@ 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1];
-$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'verbatim_in_smallformat'}{'contents'}[0];
 $result_trees{'verbatim_in_smallformat'}{'contents'}[0]{'parent'} = 
$result_trees{'verbatim_in_smallformat'};
 
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index e342756c9a..72f237ab38 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent
 
$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'navigation'}{'contents'}[2];
 $result_trees{'navigation'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'navigation'}{'contents'}[2];
 $result_trees{'navigation'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent
 
$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'navigation'}{'contents'}[4];
 $result_trees{'navigation'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'navigation'}{'contents'}[4];
 $result_trees{'navigation'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'paren
 
$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = $result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 $result_trees{'navigation'}{'contents'}[6]{'contents'}[27]{'parent'} = 
$result_trees{'navigation'}{'contents'}[6];
 $result_trees{'navigation'}{'contents'}[6]{'contents'}[28]{'parent'} = 
$result_trees{'navigation'}{'contents'}[6];
 $result_trees{'navigation'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 3495d88689..0ca2236816 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_chapter'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_chapter'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_chapter'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[0]
 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'navigation_chapter'}{'contents'}[2];
 $result_trees{'navigation_chapter'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'navigation_chapter'}{'contents'}[2];
 $result_trees{'navigation_chapter'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_chapter'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[0]
 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'navigation_chapter'}{'contents'}[4];
 $result_trees{'navigation_chapter'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'navigation_chapter'}{'contents'}[4];
 $result_trees{'navigation_chapter'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_chapter'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[0
 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 $result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[27]{'parent'} = 
$result_trees{'navigation_chapter'}{'contents'}[6];
 $result_trees{'navigation_chapter'}{'contents'}[6]{'contents'}[28]{'parent'} = 
$result_trees{'navigation_chapter'}{'contents'}[6];
 $result_trees{'navigation_chapter'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_chapter'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_chapter'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_chapter'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_chapter'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index 8ef782ea0e..0497d17b5a 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_chapter_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_chapter_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_chapter_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'con
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_no_header'}{'contents'}[2];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_chapter_no_header'}{'contents'}[2];
 $result_trees{'navigation_chapter_no_header'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_chapter_no_header'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'con
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_no_header'}{'contents'}[4];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_chapter_no_header'}{'contents'}[4];
 $result_trees{'navigation_chapter_no_header'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_chapter_no_header'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'co
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_chapter_no_header'}{'contents'}[6];
 
$result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_chapter_no_header'}{'contents'}[6];
 $result_trees{'navigation_chapter_no_header'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_chapter_no_header'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_chapter_no_header'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
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 634aaebf83..d32f5ca387 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[2]{'parent'} 
= $result_trees{'navigation_chapter_no_header_vertical'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[4]{'parent'} 
= $result_trees{'navigation_chapter_no_header_vertical'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6];
 
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[6]{'parent'} 
= $result_trees{'navigation_chapter_no_header_vertical'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_chapter_no_header_vertical'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index bf0dc18a3e..23ca9e060f 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_chapter_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_chapter_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_chapter_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'cont
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_vertical'}{'contents'}[2];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_chapter_vertical'}{'contents'}[2];
 $result_trees{'navigation_chapter_vertical'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_chapter_vertical'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'cont
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_vertical'}{'contents'}[4];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_chapter_vertical'}{'contents'}[4];
 $result_trees{'navigation_chapter_vertical'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_chapter_vertical'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'con
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_chapter_vertical'}{'contents'}[6];
 
$result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_chapter_vertical'}{'contents'}[6];
 $result_trees{'navigation_chapter_vertical'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_chapter_vertical'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_chapter_vertical'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index 2fc66bb4ec..b2d5bf36bb 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[
 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'navigation_no_header'}{'contents'}[2];
 $result_trees{'navigation_no_header'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'navigation_no_header'}{'contents'}[2];
 $result_trees{'navigation_no_header'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_no_header'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[
 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'navigation_no_header'}{'contents'}[4];
 $result_trees{'navigation_no_header'}{'contents'}[4]{'contents'}[2]{'parent'} 
= $result_trees{'navigation_no_header'}{'contents'}[4];
 $result_trees{'navigation_no_header'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_no_header'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}
 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 $result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[27]{'parent'} 
= $result_trees{'navigation_no_header'}{'contents'}[6];
 $result_trees{'navigation_no_header'}{'contents'}[6]{'contents'}[28]{'parent'} 
= $result_trees{'navigation_no_header'}{'contents'}[6];
 $result_trees{'navigation_no_header'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_no_header'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_no_header'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_no_header'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_no_header'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 1948b0cbd7..86bb6fc71a 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'co
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_no_header_vertical'}{'contents'}[2];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_no_header_vertical'}{'contents'}[2];
 $result_trees{'navigation_no_header_vertical'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_no_header_vertical'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'co
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_no_header_vertical'}{'contents'}[4];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_no_header_vertical'}{'contents'}[4];
 $result_trees{'navigation_no_header_vertical'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_no_header_vertical'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'c
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_no_header_vertical'}{'contents'}[6];
 
$result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_no_header_vertical'}{'contents'}[6];
 $result_trees{'navigation_no_header_vertical'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_no_header_vertical'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_no_header_vertical'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index f039fd73d9..b4cf7bd258 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'p
 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_node'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'navigation_node'}{'contents'}[2];
 $result_trees{'navigation_node'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'navigation_node'}{'contents'}[2];
 $result_trees{'navigation_node'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_node'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'p
 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_node'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'navigation_node'}{'contents'}[4];
 $result_trees{'navigation_node'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'navigation_node'}{'contents'}[4];
 $result_trees{'navigation_node'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_node'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[0]{'
 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 $result_trees{'navigation_node'}{'contents'}[6]{'contents'}[27]{'parent'} = 
$result_trees{'navigation_node'}{'contents'}[6];
 $result_trees{'navigation_node'}{'contents'}[6]{'contents'}[28]{'parent'} = 
$result_trees{'navigation_node'}{'contents'}[6];
 $result_trees{'navigation_node'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_node'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_node'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_node'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_node'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index a01d2ecfb1..98cd12dcea 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_node_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_node_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_node_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'conten
 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_no_header'}{'contents'}[2];
 
$result_trees{'navigation_node_no_header'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_node_no_header'}{'contents'}[2];
 $result_trees{'navigation_node_no_header'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_node_no_header'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'conten
 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_no_header'}{'contents'}[4];
 
$result_trees{'navigation_node_no_header'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_node_no_header'}{'contents'}[4];
 $result_trees{'navigation_node_no_header'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_node_no_header'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'conte
 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_node_no_header'}{'contents'}[6];
 
$result_trees{'navigation_node_no_header'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_node_no_header'}{'contents'}[6];
 $result_trees{'navigation_node_no_header'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_node_no_header'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_node_no_header'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_node_no_header'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_node_no_header'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
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 e9fdadfc02..70eea0373e 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[2];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[2];
 $result_trees{'navigation_node_no_header_vertical'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_node_no_header_vertical'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[4];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[4];
 $result_trees{'navigation_node_no_header_vertical'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_node_no_header_vertical'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[2
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[6];
 
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_node_no_header_vertical'}{'contents'}[6];
 $result_trees{'navigation_node_no_header_vertical'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_node_no_header_vertical'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_node_no_header_vertical'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index 9dcd522174..2a8a584453 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_node_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_node_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_node_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'content
 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_vertical'}{'contents'}[2];
 
$result_trees{'navigation_node_vertical'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_node_vertical'}{'contents'}[2];
 $result_trees{'navigation_node_vertical'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_node_vertical'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'content
 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_vertical'}{'contents'}[4];
 
$result_trees{'navigation_node_vertical'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_node_vertical'}{'contents'}[4];
 $result_trees{'navigation_node_vertical'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_node_vertical'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'conten
 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_node_vertical'}{'contents'}[6];
 
$result_trees{'navigation_node_vertical'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_node_vertical'}{'contents'}[6];
 $result_trees{'navigation_node_vertical'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_node_vertical'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_node_vertical'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_node_vertical'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_node_vertical'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index 2b37cfe165..af3e1701a8 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_section'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_section'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_section'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[0]
 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_section'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'navigation_section'}{'contents'}[2];
 $result_trees{'navigation_section'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'navigation_section'}{'contents'}[2];
 $result_trees{'navigation_section'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_section'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[0]
 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_section'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'navigation_section'}{'contents'}[4];
 $result_trees{'navigation_section'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'navigation_section'}{'contents'}[4];
 $result_trees{'navigation_section'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_section'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[0
 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 $result_trees{'navigation_section'}{'contents'}[6]{'contents'}[27]{'parent'} = 
$result_trees{'navigation_section'}{'contents'}[6];
 $result_trees{'navigation_section'}{'contents'}[6]{'contents'}[28]{'parent'} = 
$result_trees{'navigation_section'}{'contents'}[6];
 $result_trees{'navigation_section'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_section'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_section'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_section'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_section'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index b94334de96..0a083db953 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_section_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_section_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_section_no_header'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'con
 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_no_header'}{'contents'}[2];
 
$result_trees{'navigation_section_no_header'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_section_no_header'}{'contents'}[2];
 $result_trees{'navigation_section_no_header'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_section_no_header'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'con
 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_no_header'}{'contents'}[4];
 
$result_trees{'navigation_section_no_header'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_section_no_header'}{'contents'}[4];
 $result_trees{'navigation_section_no_header'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_section_no_header'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'co
 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_section_no_header'}{'contents'}[6];
 
$result_trees{'navigation_section_no_header'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_section_no_header'}{'contents'}[6];
 $result_trees{'navigation_section_no_header'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_section_no_header'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_section_no_header'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_section_no_header'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_section_no_header'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
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 5eeea7e3f5..5b3956f100 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[2];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[2];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[2]{'parent'} 
= $result_trees{'navigation_section_no_header_vertical'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[4];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[4];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[4]{'parent'} 
= $result_trees{'navigation_section_no_header_vertical'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[6];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_section_no_header_vertical'}{'contents'}[6];
 
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[6]{'parent'} 
= $result_trees{'navigation_section_no_header_vertical'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_section_no_header_vertical'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index 33511096b4..9219582b83 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_section_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_section_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_section_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'cont
 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_vertical'}{'contents'}[2];
 
$result_trees{'navigation_section_vertical'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_section_vertical'}{'contents'}[2];
 $result_trees{'navigation_section_vertical'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_section_vertical'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'cont
 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_vertical'}{'contents'}[4];
 
$result_trees{'navigation_section_vertical'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'navigation_section_vertical'}{'contents'}[4];
 $result_trees{'navigation_section_vertical'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_section_vertical'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'con
 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[27]{'parent'}
 = $result_trees{'navigation_section_vertical'}{'contents'}[6];
 
$result_trees{'navigation_section_vertical'}{'contents'}[6]{'contents'}[28]{'parent'}
 = $result_trees{'navigation_section_vertical'}{'contents'}[6];
 $result_trees{'navigation_section_vertical'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_section_vertical'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_section_vertical'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_section_vertical'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_section_vertical'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index 38a6d8e4d8..c11775ed48 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -245,9 +245,6 @@ $result_trees{'navigation_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -439,9 +436,6 @@ $result_trees{'navigation_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -859,9 +853,6 @@ $result_trees{'navigation_vertical'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'navigation.texi',
@@ -1033,7 +1024,6 @@ 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[0
 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1];
-$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'navigation_vertical'}{'contents'}[2];
 $result_trees{'navigation_vertical'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'navigation_vertical'}{'contents'}[2];
 $result_trees{'navigation_vertical'}{'contents'}[2]{'parent'} = 
$result_trees{'navigation_vertical'};
@@ -1059,7 +1049,6 @@ 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[0
 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1];
-$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'navigation_vertical'}{'contents'}[4];
 $result_trees{'navigation_vertical'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'navigation_vertical'}{'contents'}[4];
 $result_trees{'navigation_vertical'}{'contents'}[4]{'parent'} = 
$result_trees{'navigation_vertical'};
@@ -1125,7 +1114,6 @@ 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[
 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0];
 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27];
-$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'contents'}[1];
 $result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[27]{'parent'} 
= $result_trees{'navigation_vertical'}{'contents'}[6];
 $result_trees{'navigation_vertical'}{'contents'}[6]{'contents'}[28]{'parent'} 
= $result_trees{'navigation_vertical'}{'contents'}[6];
 $result_trees{'navigation_vertical'}{'contents'}[6]{'parent'} = 
$result_trees{'navigation_vertical'};
@@ -1353,8 +1341,7 @@ $result_nodes{'navigation_vertical'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1372,8 +1359,7 @@ $result_nodes{'navigation_vertical'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1391,8 +1377,7 @@ $result_nodes{'navigation_vertical'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 15ba771184..2c2dfb2d13 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -341,9 +341,6 @@ $result_trees{'no_monolithic'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'no_monolithic.texi',
@@ -597,7 +594,6 @@ 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'par
 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5];
-$result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'no_monolithic'}{'contents'}[2];
 $result_trees{'no_monolithic'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'no_monolithic'}{'contents'}[2];
 $result_trees{'no_monolithic'}{'contents'}[2]{'parent'} = 
$result_trees{'no_monolithic'};
@@ -729,8 +725,7 @@ $result_nodes{'no_monolithic'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/macro/complete_macro_for_end.pl 
b/tp/t/results/macro/complete_macro_for_end.pl
index 0591bb891e..15963507ae 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -94,9 +94,6 @@ $result_trees{'complete_macro_for_end'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -121,7 +118,6 @@ 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3]{'args'}[0]
 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3];
-$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'complete_macro_for_end'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'complete_macro_for_end'}{'contents'}[0];
 $result_trees{'complete_macro_for_end'}{'contents'}[0]{'parent'} = 
$result_trees{'complete_macro_for_end'};
 
diff --git a/tp/t/results/macro/macro_for_end.pl 
b/tp/t/results/macro/macro_for_end.pl
index d4538d4308..e08757ac8a 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -98,9 +98,6 @@ $result_trees{'macro_for_end'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -125,7 +122,6 @@ 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'
 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3];
-$result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'macro_for_end'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'macro_for_end'}{'contents'}[0];
 $result_trees{'macro_for_end'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_for_end'};
 
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index 0012e9b961..770ad3746f 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -218,7 +218,6 @@ $result_trees{'macro_in_brace_command'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -262,7 +261,6 @@ 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6]{'contents'
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[6]{'parent'} 
= $result_trees{'macro_in_brace_command'}{'contents'}[0];
 $result_trees{'macro_in_brace_command'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_brace_command'};
 
diff --git a/tp/t/results/macro/macro_in_end_argument.pl 
b/tp/t/results/macro/macro_in_end_argument.pl
index 9de8292ed7..9b5b271d74 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -98,9 +98,6 @@ $result_trees{'macro_in_end_argument'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -125,7 +122,6 @@ 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3]{'args'}[0]{
 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3];
-$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'macro_in_end_argument'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'macro_in_end_argument'}{'contents'}[0];
 $result_trees{'macro_in_end_argument'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_end_argument'};
 
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index 9ff1041eca..f25fa3c362 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -653,9 +653,6 @@ $result_trees{'macro_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -769,7 +766,6 @@ 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19]{'contents'}[5]{'pa
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19]{'contents'}[6];
 
$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19];
-$result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19]{'extra'}{'end_command'}
 = $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19]{'contents'}[6];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'contents'}[19]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_menu'};
 
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 899079179e..ec2b3ca016 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -1491,9 +1491,6 @@ $result_trees{'macro_in_misc_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -3268,9 +3265,6 @@ $result_trees{'macro_in_misc_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -3709,7 +3703,6 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66]{'contents
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66]{'contents'}[1]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66]{'extra'}{'end_command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[66]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[67]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[68];
@@ -3943,7 +3936,6 @@ 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'content
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'contents'}[1]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154];
-$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'extra'}{'end_command'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[154]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[155]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
@@ -4332,8 +4324,7 @@ $result_nodes{'macro_in_misc_commands'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/macro/space_macro_after_end.pl 
b/tp/t/results/macro/space_macro_after_end.pl
index d7f4308092..dcd33bdbcf 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -108,9 +108,6 @@ $result_trees{'space_macro_after_end'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -137,7 +134,6 @@ 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3]{'contents'}
 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3];
-$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'space_macro_after_end'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'space_macro_after_end'}{'contents'}[0];
 $result_trees{'space_macro_after_end'}{'contents'}[0]{'parent'} = 
$result_trees{'space_macro_after_end'};
 
diff --git a/tp/t/results/menu/bad_beginning.pl 
b/tp/t/results/menu/bad_beginning.pl
index 1e56fc2a32..8586a932e9 100644
--- a/tp/t/results/menu/bad_beginning.pl
+++ b/tp/t/results/menu/bad_beginning.pl
@@ -107,9 +107,6 @@ $result_trees{'bad_beginning'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -138,7 +135,6 @@ 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'par
 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0];
-$result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'bad_beginning'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'bad_beginning'}{'contents'}[0];
 $result_trees{'bad_beginning'}{'contents'}[0]{'parent'} = 
$result_trees{'bad_beginning'};
 
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 4431c847e5..5c0a11b111 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -237,8 +237,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                         }
                       ],
                       'extra' => {
-                        'command_as_argument' => {},
-                        'end_command' => {}
+                        'command_as_argument' => {}
                       },
                       'parent' => {},
                       'source_info' => {
@@ -392,7 +391,6 @@ $result_trees{'block_commands_in_menu_description'} = {
                       ],
                       'extra' => {
                         'command_as_argument' => {},
-                        'end_command' => {},
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -471,9 +469,6 @@ $result_trees{'block_commands_in_menu_description'} = {
                               }
                             }
                           ],
-                          'extra' => {
-                            'end_command' => {}
-                          },
                           'parent' => {},
                           'source_info' => {
                             'file_name' => '',
@@ -568,9 +563,6 @@ $result_trees{'block_commands_in_menu_description'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -623,7 +615,6 @@ 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[2];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[2];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2];
@@ -644,7 +635,6 @@ 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'contents'}[2];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'contents'}[2];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0];
@@ -654,7 +644,6 @@ 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[3]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[4];
@@ -669,7 +658,6 @@ 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'block_commands_in_menu_description'}{'contents'}[2];
 $result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'parent'} = 
$result_trees{'block_commands_in_menu_description'};
 
@@ -752,8 +740,7 @@ $result_nodes{'block_commands_in_menu_description'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index bd771f9c87..f0ab61a284 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -155,7 +155,6 @@ $result_trees{'comment_on_menu_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '  '
           },
           'parent' => {},
@@ -287,7 +286,6 @@ 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1];
-$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'comment_on_menu_line'}{'contents'}[1];
 $result_trees{'comment_on_menu_line'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'comment_on_menu_line'}{'contents'}[1];
 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_on_menu_line'}{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/menu/dash_in_menu.pl 
b/tp/t/results/menu/dash_in_menu.pl
index e38e5942a2..7f5565ef35 100644
--- a/tp/t/results/menu/dash_in_menu.pl
+++ b/tp/t/results/menu/dash_in_menu.pl
@@ -170,9 +170,6 @@ $result_trees{'dash_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -214,7 +211,6 @@ 
$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'pare
 
$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1];
-$result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 $result_trees{'dash_in_menu'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'dash_in_menu'}{'contents'}[0];
 $result_trees{'dash_in_menu'}{'contents'}[0]{'parent'} = 
$result_trees{'dash_in_menu'};
 
diff --git a/tp/t/results/menu/detailmenu.pl b/tp/t/results/menu/detailmenu.pl
index f8bedb8b5a..40889cf5b2 100644
--- a/tp/t/results/menu/detailmenu.pl
+++ b/tp/t/results/menu/detailmenu.pl
@@ -205,9 +205,6 @@ $result_trees{'detailmenu'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -245,9 +242,6 @@ $result_trees{'detailmenu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -291,12 +285,10 @@ 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'conten
 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1];
-$result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'contents'}[3];
 $result_trees{'detailmenu'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'detailmenu'}{'contents'}[0];
 $result_trees{'detailmenu'}{'contents'}[0]{'parent'} = 
$result_trees{'detailmenu'};
 
diff --git a/tp/t/results/menu/detailmenu_in_description.pl 
b/tp/t/results/menu/detailmenu_in_description.pl
index 6fbf89949a..fb46b34cbd 100644
--- a/tp/t/results/menu/detailmenu_in_description.pl
+++ b/tp/t/results/menu/detailmenu_in_description.pl
@@ -187,9 +187,6 @@ $result_trees{'detailmenu_in_description'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -227,9 +224,6 @@ $result_trees{'detailmenu_in_description'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -270,12 +264,10 @@ 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'conten
 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1];
-$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'detailmenu_in_description'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'detailmenu_in_description'}{'contents'}[0];
 $result_trees{'detailmenu_in_description'}{'contents'}[0]{'parent'} = 
$result_trees{'detailmenu_in_description'};
 
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index 741fac0140..2d328ca522 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -325,9 +325,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -534,9 +531,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -574,9 +568,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -768,9 +759,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1096,9 +1084,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1320,7 +1305,6 @@ 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
@@ -1353,12 +1337,10 @@ 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'args'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'detailmenu_on_subnodes'}{'contents'}[2];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'detailmenu_on_subnodes'}{'contents'}[2];
 $result_trees{'detailmenu_on_subnodes'}{'contents'}[2]{'parent'} = 
$result_trees{'detailmenu_on_subnodes'};
@@ -1384,7 +1366,6 @@ 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'detailmenu_on_subnodes'}{'contents'}[4];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[2]{'parent'} 
= $result_trees{'detailmenu_on_subnodes'}{'contents'}[4];
 $result_trees{'detailmenu_on_subnodes'}{'contents'}[4]{'parent'} = 
$result_trees{'detailmenu_on_subnodes'};
@@ -1429,7 +1410,6 @@ 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1];
-$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'parent'} 
= $result_trees{'detailmenu_on_subnodes'}{'contents'}[8];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'parent'} 
= $result_trees{'detailmenu_on_subnodes'}{'contents'}[8];
 $result_trees{'detailmenu_on_subnodes'}{'contents'}[8]{'parent'} = 
$result_trees{'detailmenu_on_subnodes'};
@@ -1672,8 +1652,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1691,8 +1670,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1726,8 +1704,7 @@ $result_nodes{'detailmenu_on_subnodes'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'chapter-2'
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 08c9a74dfd..a42106aa4c 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -152,9 +152,6 @@ $result_trees{'detailmenu_unknown_node'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -192,9 +189,6 @@ $result_trees{'detailmenu_unknown_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -247,12 +241,10 @@ 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1];
-$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'detailmenu_unknown_node'}{'contents'}[1];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'detailmenu_unknown_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -277,8 +269,7 @@ $result_nodes{'detailmenu_unknown_node'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 c212b21b0b..63f95a6030 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -230,9 +230,6 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -286,7 +283,6 @@ 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'
 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1];
 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2];
-$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'contents'}[1];
 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2];
 
$result_trees{'direntry_dircategory_after_first_node'}{'contents'}[2]{'parent'} 
= $result_trees{'direntry_dircategory_after_first_node'};
 
diff --git a/tp/t/results/menu/empty_menu_entry_name.pl 
b/tp/t/results/menu/empty_menu_entry_name.pl
index ff41218ec0..ce0d7929c3 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -224,9 +224,6 @@ $result_trees{'empty_menu_entry_name'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -343,7 +340,6 @@ 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}
 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1];
-$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'empty_menu_entry_name'}{'contents'}[1];
 $result_trees{'empty_menu_entry_name'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'empty_menu_entry_name'}{'contents'}[1];
 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_menu_entry_name'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -377,8 +373,7 @@ $result_nodes{'empty_menu_entry_name'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index 60e872ad39..210ee58b47 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -152,9 +152,6 @@ $result_trees{'entry_after_detailmenu'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -367,9 +364,6 @@ $result_trees{'entry_after_detailmenu'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -464,9 +458,6 @@ $result_trees{'entry_after_detailmenu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -607,7 +598,6 @@ 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -641,7 +631,6 @@ 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[1];
@@ -656,7 +645,6 @@ 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1];
-$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'entry_after_detailmenu'}{'contents'}[1];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'entry_after_detailmenu'}{'contents'}[1];
 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'entry_after_detailmenu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -712,8 +700,7 @@ $result_nodes{'entry_after_detailmenu'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/example_in_menu_comment.pl 
b/tp/t/results/menu/example_in_menu_comment.pl
index e09141ab3d..b2a18d4c03 100644
--- a/tp/t/results/menu/example_in_menu_comment.pl
+++ b/tp/t/results/menu/example_in_menu_comment.pl
@@ -160,9 +160,6 @@ $result_trees{'example_in_menu_comment'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -227,9 +224,6 @@ $result_trees{'example_in_menu_comment'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -265,7 +259,6 @@ 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
@@ -275,7 +268,6 @@ 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0];
 $result_trees{'example_in_menu_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'example_in_menu_comment'};
 
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 83f8cbf792..a142ac0611 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -201,9 +201,6 @@ $result_trees{'example_in_menu_description'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -280,9 +277,6 @@ $result_trees{'example_in_menu_description'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -330,7 +324,6 @@ 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'cont
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
-$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3]{'parent'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
@@ -342,7 +335,6 @@ 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'cont
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1];
-$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'example_in_menu_description'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'example_in_menu_description'}{'contents'}[2];
 $result_trees{'example_in_menu_description'}{'contents'}[2]{'parent'} = 
$result_trees{'example_in_menu_description'};
 
@@ -406,8 +398,7 @@ $result_nodes{'example_in_menu_description'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 9b75f2e6a7..e17efed564 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -209,7 +209,6 @@ $result_trees{'formats_in_menu'} = {
                       ],
                       'extra' => {
                         'command_as_argument' => {},
-                        'end_command' => {},
                         'spaces_before_argument' => ' '
                       },
                       'parent' => {},
@@ -465,9 +464,6 @@ $result_trees{'formats_in_menu'} = {
                               }
                             }
                           ],
-                          'extra' => {
-                            'end_command' => {}
-                          },
                           'parent' => {},
                           'source_info' => {
                             'file_name' => '',
@@ -670,9 +666,6 @@ $result_trees{'formats_in_menu'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -726,9 +719,6 @@ $result_trees{'formats_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -789,7 +779,6 @@ 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'a
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[3];
@@ -831,7 +820,6 @@ 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'a
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[3];
@@ -864,7 +852,6 @@ 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'c
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[2];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5];
@@ -872,7 +859,6 @@ 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'p
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
 $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'formats_in_menu'}{'contents'}[1];
 $result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -933,8 +919,7 @@ $result_nodes{'formats_in_menu'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index b336b6f598..551b20bb65 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -259,9 +259,6 @@ $result_trees{'inlineraw_in_menu_description'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -319,7 +316,6 @@ 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'co
 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1];
-$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'inlineraw_in_menu_description'}{'contents'}[2];
 $result_trees{'inlineraw_in_menu_description'}{'contents'}[2]{'parent'} = 
$result_trees{'inlineraw_in_menu_description'};
 
@@ -379,8 +375,7 @@ $result_nodes{'inlineraw_in_menu_description'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index b6fdc3ac46..c068865bd9 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -595,9 +595,6 @@ $result_trees{'invalid_info_menu_entry'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -735,7 +732,6 @@ 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents
 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5];
 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1];
-$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[5];
 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'invalid_info_menu_entry'}{'contents'}[1];
 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'invalid_info_menu_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -766,8 +762,7 @@ $result_nodes{'invalid_info_menu_entry'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/menu_entry_name.pl 
b/tp/t/results/menu/menu_entry_name.pl
index 84885b9ab4..0d0998bed5 100644
--- a/tp/t/results/menu/menu_entry_name.pl
+++ b/tp/t/results/menu/menu_entry_name.pl
@@ -933,9 +933,6 @@ $result_trees{'menu_entry_name'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1135,7 +1132,6 @@ 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'p
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[10];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0];
-$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'contents'}[10];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_name'};
 
diff --git a/tp/t/results/menu/menu_entry_name_comment.pl 
b/tp/t/results/menu/menu_entry_name_comment.pl
index c3adca2d20..ce6d1c5064 100644
--- a/tp/t/results/menu/menu_entry_name_comment.pl
+++ b/tp/t/results/menu/menu_entry_name_comment.pl
@@ -558,9 +558,6 @@ $result_trees{'menu_entry_name_comment'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -675,7 +672,6 @@ 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0];
 $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_name_comment'};
 
diff --git a/tp/t/results/menu/menu_entry_no_entry.pl 
b/tp/t/results/menu/menu_entry_no_entry.pl
index babf71a9f4..2125340b94 100644
--- a/tp/t/results/menu/menu_entry_no_entry.pl
+++ b/tp/t/results/menu/menu_entry_no_entry.pl
@@ -198,9 +198,6 @@ $result_trees{'menu_entry_no_entry'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -241,7 +238,6 @@ 
$result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0];
-$result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'menu_entry_no_entry'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_no_entry'}{'contents'}[0];
 $result_trees{'menu_entry_no_entry'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_no_entry'};
 
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 70b4506cef..42a512e653 100644
--- a/tp/t/results/menu/menu_entry_no_entry_location.pl
+++ b/tp/t/results/menu/menu_entry_no_entry_location.pl
@@ -265,9 +265,6 @@ $result_trees{'menu_entry_no_entry_location'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -326,7 +323,6 @@ 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0];
-$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_no_entry_location'}{'contents'}[0];
 $result_trees{'menu_entry_no_entry_location'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_no_entry_location'};
 
diff --git a/tp/t/results/menu/menu_entry_node.pl 
b/tp/t/results/menu/menu_entry_node.pl
index 9a066d8491..2166fa9101 100644
--- a/tp/t/results/menu/menu_entry_node.pl
+++ b/tp/t/results/menu/menu_entry_node.pl
@@ -351,9 +351,6 @@ $result_trees{'menu_entry_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -432,7 +429,6 @@ 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'p
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0];
-$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_node'}{'contents'}[0];
 $result_trees{'menu_entry_node'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_node'};
 
diff --git a/tp/t/results/menu/menu_entry_node_comments.pl 
b/tp/t/results/menu/menu_entry_node_comments.pl
index 6bccf6cc55..2079b5bbf0 100644
--- a/tp/t/results/menu/menu_entry_node_comments.pl
+++ b/tp/t/results/menu/menu_entry_node_comments.pl
@@ -407,9 +407,6 @@ $result_trees{'menu_entry_node_comments'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -492,7 +489,6 @@ 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0];
-$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0];
 $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_node_comments'};
 
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index ff363603df..4852c1c91a 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -237,9 +237,6 @@ $result_trees{'menu_in_deffn'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -282,7 +279,6 @@ $result_trees{'menu_in_deffn'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -352,13 +348,11 @@ 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'con
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 $result_trees{'menu_in_deffn'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'menu_in_deffn'}{'contents'}[1];
 $result_trees{'menu_in_deffn'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_in_deffn'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menu_in_deffn'}{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index e2154ea590..540c550679 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -163,9 +163,6 @@ $result_trees{'menu_in_example'} = {
                               }
                             }
                           ],
-                          'extra' => {
-                            'end_command' => {}
-                          },
                           'parent' => {},
                           'source_info' => {
                             'file_name' => '',
@@ -263,9 +260,6 @@ $result_trees{'menu_in_example'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -487,9 +481,6 @@ $result_trees{'menu_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -527,9 +518,6 @@ $result_trees{'menu_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -583,7 +571,6 @@ 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'c
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[3];
@@ -597,7 +584,6 @@ 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'c
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
@@ -639,12 +625,10 @@ 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'c
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'menu_in_example'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'menu_in_example'}{'contents'}[1];
 $result_trees{'menu_in_example'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_in_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'menu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index 9eea38fda7..a0454a845d 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -144,9 +144,6 @@ $result_trees{'menu_node_unterminated'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -201,7 +198,6 @@ 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'menu_node_unterminated'}{'contents'}[1];
 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'menu_node_unterminated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -224,8 +220,7 @@ $result_nodes{'menu_node_unterminated'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index 555a44e72c..50f9cf7549 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -236,9 +236,6 @@ $result_trees{'menu_pointing_to_anchor'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -292,7 +289,6 @@ 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents
 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6];
-$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'menu_pointing_to_anchor'}{'contents'}[2];
 $result_trees{'menu_pointing_to_anchor'}{'contents'}[2]{'parent'} = 
$result_trees{'menu_pointing_to_anchor'};
 
@@ -353,8 +349,7 @@ $result_nodes{'menu_pointing_to_anchor'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index 2352d9d83f..6382f9e93c 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -155,9 +155,6 @@ $result_trees{'menu_title_before_entries'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -259,7 +256,6 @@ 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'conten
 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1];
-$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'menu_title_before_entries'}{'contents'}[1];
 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'menu_title_before_entries'}{'contents'}[1];
 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'menu_title_before_entries'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -293,8 +289,7 @@ $result_nodes{'menu_title_before_entries'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl 
b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
index f152b60c77..072de8e7d0 100644
--- a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -454,9 +454,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -648,9 +645,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -976,9 +970,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1224,7 +1215,6 @@ 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'c
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[0];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'parent'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2];
 $result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[2]{'parent'} = 
$result_trees{'missing_detailmenu_on_subnodes'};
@@ -1250,7 +1240,6 @@ 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'c
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4];
 $result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[4]{'parent'} = 
$result_trees{'missing_detailmenu_on_subnodes'};
@@ -1295,7 +1284,6 @@ 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'c
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1];
-$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8];
 
$result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8];
 $result_trees{'missing_detailmenu_on_subnodes'}{'contents'}[8]{'parent'} = 
$result_trees{'missing_detailmenu_on_subnodes'};
@@ -1534,8 +1522,7 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1553,8 +1540,7 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1610,8 +1596,7 @@ $result_nodes{'missing_detailmenu_on_subnodes'} = {
                         },
                         'menus' => [
                           {
-                            'cmdname' => 'menu',
-                            'extra' => {}
+                            'cmdname' => 'menu'
                           }
                         ],
                         'normalized' => 'chapter-2'
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index a1321878d4..cbc526b3cc 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -153,9 +153,6 @@ $result_trees{'multiple_menus'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -285,9 +282,6 @@ $result_trees{'multiple_menus'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -343,7 +337,6 @@ 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'pa
 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1];
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'multiple_menus'}{'contents'}[1];
 $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'multiple_menus'}{'contents'}[1];
 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3];
@@ -364,7 +357,6 @@ 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'pa
 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3];
-$result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 $result_trees{'multiple_menus'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'multiple_menus'}{'contents'}[1];
 $result_trees{'multiple_menus'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'multiple_menus'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'multiple_menus'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'multiple_menus'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -393,12 +385,10 @@ $result_nodes{'multiple_menus'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       },
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index be1ad89ca4..f06c6078b8 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -98,9 +98,6 @@ $result_trees{'no_colon_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -145,7 +142,6 @@ 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'
 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1];
-$result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'no_colon_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'no_colon_in_menu'}{'contents'}[1];
 $result_trees{'no_colon_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'no_colon_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'no_colon_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -168,8 +164,7 @@ $result_nodes{'no_colon_in_menu'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index d3d1a9271a..616a5a066c 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -152,9 +152,6 @@ $result_trees{'reference_to_external_manual'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -209,7 +206,6 @@ 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'con
 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1];
-$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'reference_to_external_manual'}{'contents'}[1];
 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'reference_to_external_manual'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -234,8 +230,7 @@ $result_nodes{'reference_to_external_manual'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 428b2f59c3..704e469ed6 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -402,9 +402,6 @@ $result_trees{'sc_in_menu'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -446,9 +443,6 @@ $result_trees{'sc_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -777,9 +771,6 @@ $result_trees{'sc_in_menu'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -817,9 +808,6 @@ $result_trees{'sc_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -916,13 +904,11 @@ 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'conten
 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1];
-$result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'sc_in_menu'}{'contents'}[1];
 $result_trees{'sc_in_menu'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'sc_in_menu'}{'contents'}[1];
 $result_trees{'sc_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'sc_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -970,12 +956,10 @@ 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'conten
 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1];
-$result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'sc_in_menu'}{'contents'}[2];
 $result_trees{'sc_in_menu'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'sc_in_menu'}{'contents'}[2];
 $result_trees{'sc_in_menu'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'sc_in_menu'}{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -1032,8 +1016,7 @@ $result_nodes{'sc_in_menu'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/simple.pl b/tp/t/results/menu/simple.pl
index ba4bdae4b3..081ba1d7b4 100644
--- a/tp/t/results/menu/simple.pl
+++ b/tp/t/results/menu/simple.pl
@@ -449,9 +449,6 @@ $result_trees{'simple'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -560,7 +557,6 @@ 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'parent'} =
 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[7]{'args'}[0];
 
$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[7];
 $result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[7]{'parent'} 
= $result_trees{'simple'}{'contents'}[0]{'contents'}[3];
-$result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'} 
= $result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'contents'}[7];
 $result_trees{'simple'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[0];
 $result_trees{'simple'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[0];
 $result_trees{'simple'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'} 
= $result_trees{'simple'}{'contents'}[0]{'contents'}[5];
diff --git a/tp/t/results/menu/simple_no_menu.pl 
b/tp/t/results/menu/simple_no_menu.pl
index 007f607434..12c452b4af 100644
--- a/tp/t/results/menu/simple_no_menu.pl
+++ b/tp/t/results/menu/simple_no_menu.pl
@@ -449,9 +449,6 @@ $result_trees{'simple_no_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -560,7 +557,6 @@ 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[6]{'pa
 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[7]{'args'}[0];
 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[7];
 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[7]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3];
-$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'contents'}[7];
 $result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[0];
 $result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[0];
 
$result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[0]{'contents'}[5];
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 d93a667f6c..e6756ff949 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
@@ -753,9 +753,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1008,7 +1005,6 @@ 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[0];
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'parent'}
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'space_and_commands_in_menu_node'}{'contents'}[2];
 
$result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'space_and_commands_in_menu_node'}{'contents'}[2];
 $result_trees{'space_and_commands_in_menu_node'}{'contents'}[2]{'parent'} = 
$result_trees{'space_and_commands_in_menu_node'};
@@ -1123,8 +1119,7 @@ $result_nodes{'space_and_commands_in_menu_node'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index 8effc00293..fe91757b32 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -155,9 +155,6 @@ $result_trees{'submenu_in_example'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -244,9 +241,6 @@ $result_trees{'submenu_in_example'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -343,9 +337,6 @@ $result_trees{'submenu_in_example'} = {
                               }
                             }
                           ],
-                          'extra' => {
-                            'end_command' => {}
-                          },
                           'parent' => {},
                           'source_info' => {
                             'file_name' => '',
@@ -387,9 +378,6 @@ $result_trees{'submenu_in_example'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -522,7 +510,6 @@ $result_trees{'submenu_in_example'} = {
                         }
                       ],
                       'extra' => {
-                        'end_command' => {},
                         'enumerate_specification' => '1'
                       },
                       'parent' => {},
@@ -578,9 +565,6 @@ $result_trees{'submenu_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -618,9 +602,6 @@ $result_trees{'submenu_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -672,7 +653,6 @@ 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[2];
@@ -684,7 +664,6 @@ 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3];
-$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[4];
@@ -696,13 +675,11 @@ 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0];
-$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5];
-$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
@@ -718,7 +695,6 @@ 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[3];
-$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[3]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[4];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[4]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[6];
@@ -726,12 +702,10 @@ 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[7];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1];
-$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 $result_trees{'submenu_in_example'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'submenu_in_example'}{'contents'}[1];
 $result_trees{'submenu_in_example'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'submenu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'submenu_in_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'submenu_in_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index 771888b455..1ec180e242 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -242,9 +242,6 @@ $result_trees{'verb_in_menu_description'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -299,7 +296,6 @@ 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'content
 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1];
-$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'verb_in_menu_description'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'verb_in_menu_description'}{'contents'}[2];
 $result_trees{'verb_in_menu_description'}{'contents'}[2]{'parent'} = 
$result_trees{'verb_in_menu_description'};
 
@@ -361,8 +357,7 @@ $result_nodes{'verb_in_menu_description'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index a1fbea3acb..7b68c2384e 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -635,9 +635,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -1085,9 +1082,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -1507,9 +1501,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1589,9 +1580,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -2156,9 +2144,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2606,9 +2591,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -3412,9 +3394,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -3862,9 +3841,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -4284,9 +4260,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -4410,7 +4383,6 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[3];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[3]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
@@ -4478,7 +4450,6 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[7]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[7]{'contents'}[1]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[7];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[7]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[7]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[8]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[8];
@@ -4541,7 +4512,6 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[11]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[11];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[11]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[11];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0];
@@ -4551,7 +4521,6 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[2];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[2]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[2];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[0]{'contents'}[0];
@@ -4636,7 +4605,6 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[3];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[4];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4];
@@ -4704,7 +4672,6 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[8]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[8]{'contents'}[1]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[8];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[8]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[8]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[9]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[9];
@@ -4828,7 +4795,6 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[1];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'contents'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[2];
@@ -4896,7 +4862,6 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[3];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'contents'}[1];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[3]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[4]{'contents'}[0];
@@ -4959,7 +4924,6 @@ 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[5]{'args'}[0];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[5];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[5]{'parent'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13];
-$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'contents'}[5];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[13]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'contents'}[14]{'parent'}
 = $result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4];
 
$result_trees{'codequoteundirected_codequotebacktick'}{'contents'}[4]{'parent'} 
= $result_trees{'codequoteundirected_codequotebacktick'};
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 e8489e6093..90870177c5 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
@@ -607,7 +607,6 @@ $result_trees{'comment_space_command_on_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -797,7 +796,6 @@ 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'co
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9];
-$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'extra'}{'float_section'}
 = $result_trees{'comment_space_command_on_line'}{'contents'}[4];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'comment_space_command_on_line'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/misc_commands/double_exdent.pl 
b/tp/t/results/misc_commands/double_exdent.pl
index 8ced82b4c2..e1b9ee691a 100644
--- a/tp/t/results/misc_commands/double_exdent.pl
+++ b/tp/t/results/misc_commands/double_exdent.pl
@@ -137,9 +137,6 @@ $result_trees{'double_exdent'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -177,9 +174,6 @@ $result_trees{'double_exdent'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -208,12 +202,10 @@ 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'con
 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0];
-$result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'double_exdent'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'double_exdent'}{'contents'}[0];
 $result_trees{'double_exdent'}{'contents'}[0]{'parent'} = 
$result_trees{'double_exdent'};
 
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl 
b/tp/t/results/misc_commands/footnote_in_center.pl
index d431b36fe0..a8caa8b2af 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -172,7 +172,6 @@ $result_trees{'footnote_in_center'} = {
                               ],
                               'extra' => {
                                 'command_as_argument' => {},
-                                'end_command' => {},
                                 'spaces_before_argument' => ' '
                               },
                               'parent' => {},
@@ -212,9 +211,6 @@ $result_trees{'footnote_in_center'} = {
                               }
                             }
                           ],
-                          'extra' => {
-                            'end_command' => {}
-                          },
                           'parent' => {},
                           'source_info' => {
                             'file_name' => '',
@@ -287,12 +283,10 @@ 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'co
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2];
-$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0];
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 d230fc00c5..3079a9c576 100644
--- a/tp/t/results/misc_commands/heading_command_in_commands.pl
+++ b/tp/t/results/misc_commands/heading_command_in_commands.pl
@@ -161,9 +161,6 @@ $result_trees{'heading_command_in_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -249,9 +246,6 @@ $result_trees{'heading_command_in_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -284,7 +278,6 @@ 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3]{'cont
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3];
-$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'heading_command_in_commands'}{'contents'}[0];
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'heading_command_in_commands'}{'contents'}[0];
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5];
@@ -294,7 +287,6 @@ 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'cont
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5];
-$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
 
$result_trees{'heading_command_in_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'heading_command_in_commands'}{'contents'}[0];
 $result_trees{'heading_command_in_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'heading_command_in_commands'};
 
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl 
b/tp/t/results/misc_commands/indent_in_quotation.pl
index 435ea6af1c..ba25e2bf7d 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -85,9 +85,6 @@ $result_trees{'indent_in_quotation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -111,7 +108,6 @@ 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[2
 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0];
-$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'indent_in_quotation'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'indent_in_quotation'}{'contents'}[0];
 $result_trees{'indent_in_quotation'}{'contents'}[0]{'parent'} = 
$result_trees{'indent_in_quotation'};
 
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index b5897df9e0..ba7a9be37b 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -665,9 +665,6 @@ $result_trees{'kbdinputstyle'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1217,9 +1214,6 @@ $result_trees{'kbdinputstyle'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1760,9 +1754,6 @@ $result_trees{'kbdinputstyle'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1868,7 +1859,6 @@ 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'pa
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10];
-$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[12];
@@ -1945,7 +1935,6 @@ 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19]{'contents'}[0]{'pa
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'args'}[0];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19]{'contents'}[1];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19];
-$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19]{'extra'}{'end_command'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19]{'contents'}[1];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[19]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[20]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[21]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[21];
@@ -2022,7 +2011,6 @@ 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'pa
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28]{'contents'}[1];
 
$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28];
-$result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28]{'extra'}{'end_command'}
 = $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28]{'contents'}[1];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'contents'}[28]{'parent'} = 
$result_trees{'kbdinputstyle'}{'contents'}[0];
 $result_trees{'kbdinputstyle'}{'contents'}[0]{'parent'} = 
$result_trees{'kbdinputstyle'};
 
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 68cde5b955..98bf0bef80 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -310,7 +310,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
           'extra' => {
             'command_as_argument' => {},
             'command_as_argument_kbd_code' => 1,
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -435,7 +434,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
           'extra' => {
             'command_as_argument' => {},
             'command_as_argument_kbd_code' => 1,
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -578,7 +576,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               'extra' => {
                 'command_as_argument' => {},
                 'command_as_argument_kbd_code' => 1,
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -697,7 +694,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               'extra' => {
                 'command_as_argument' => {},
                 'command_as_argument_kbd_code' => 1,
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -737,9 +733,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -913,7 +906,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
           'extra' => {
             'command_as_argument' => {},
             'command_as_argument_kbd_code' => 1,
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1038,7 +1030,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
           'extra' => {
             'command_as_argument' => {},
             'command_as_argument_kbd_code' => 1,
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1177,7 +1168,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -1292,7 +1282,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -1332,9 +1321,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1504,7 +1490,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1625,7 +1610,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1764,7 +1748,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -1879,7 +1862,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -1919,9 +1901,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1977,7 +1956,6 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7]{'contents'
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[7]{'parent'} 
= $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[8]{'parent'} 
= $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
@@ -1992,7 +1970,6 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'contents'
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[9]{'parent'} 
= $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11];
@@ -2009,7 +1986,6 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0];
@@ -2023,12 +1999,10 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[2]{'args'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[2];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[2]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'contents'}[2];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[14];
@@ -2050,7 +2024,6 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0];
@@ -2065,7 +2038,6 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[20]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[21]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22];
@@ -2082,7 +2054,6 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0];
@@ -2096,12 +2067,10 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[2]{'args'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[2];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[2]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'contents'}[2];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[23]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[24]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[25]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[25];
@@ -2123,7 +2092,6 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[29]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[30]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'args'}[0]{'contents'}[0];
@@ -2138,7 +2106,6 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[31]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[32]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33];
@@ -2155,7 +2122,6 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[0]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0];
@@ -2169,12 +2135,10 @@ 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'contents'}[1];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[2]{'args'}[0];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[2];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[2]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'contents'}[2];
 
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[34]{'parent'}
 = $result_trees{'kbdinputstyle_in_table'}{'contents'}[0];
 $result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'parent'} = 
$result_trees{'kbdinputstyle_in_table'};
 
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl 
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index f6ab2d8d8d..1a5def9f79 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -80,9 +80,6 @@ $result_trees{'noindent_after_smallexample'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -138,7 +135,6 @@ 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'cont
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1];
-$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0];
 
$result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_associated_command'}
 = $result_trees{'noindent_after_smallexample'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 711d5fe9ca..4c1213fec7 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -655,9 +655,6 @@ $result_trees{'test_allowcodebreaks'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1171,9 +1168,6 @@ $result_trees{'test_allowcodebreaks'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1697,9 +1691,6 @@ $result_trees{'test_allowcodebreaks'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2213,9 +2204,6 @@ $result_trees{'test_allowcodebreaks'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2344,7 +2332,6 @@ 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9]{'contents'}[
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9]{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9]{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[9]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[10]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[11]{'args'}[0];
@@ -2419,7 +2406,6 @@ 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14]{'contents'}
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14]{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14]{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[14]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[15]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16]{'contents'}[0]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[16];
@@ -2496,7 +2482,6 @@ 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18]{'contents'}
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18]{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18]{'contents'}[1]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18]{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[18]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[19]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[20]{'args'}[0];
@@ -2571,7 +2556,6 @@ 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23]{'contents'}
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23]{'contents'}[1]{'args'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23]{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23]{'contents'}[1]{'parent'}
 = $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23];
-$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23]{'extra'}{'end_command'}
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23]{'contents'}[1];
 $result_trees{'test_allowcodebreaks'}{'contents'}[1]{'contents'}[23]{'parent'} 
= $result_trees{'test_allowcodebreaks'}{'contents'}[1];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'test_allowcodebreaks'}{'contents'}[1]{'args'}[0]{'contents'}[0];
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 27b06aebec..635e0a05fa 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -268,8 +268,7 @@ $result_trees{'text_before_line_command'} = {
           'extra' => {
             'authors' => [
               {}
-            ],
-            'end_command' => {}
+            ]
           },
           'parent' => {},
           'source_info' => {
@@ -328,7 +327,6 @@ 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'content
 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'extra'}{'authors'}[0]
 = 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1];
-$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'text_before_line_command'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'text_before_line_command'}{'contents'}[2];
 $result_trees{'text_before_line_command'}{'contents'}[2]{'parent'} = 
$result_trees{'text_before_line_command'};
 
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 0a1b9386eb..7056cd3f12 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -521,9 +521,6 @@ $result_trees{'formatting_fr'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -805,9 +802,6 @@ $result_trees{'formatting_fr'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -916,9 +910,6 @@ $result_trees{'formatting_fr'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -1216,9 +1207,6 @@ $result_trees{'formatting_fr'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -1354,9 +1342,6 @@ $result_trees{'formatting_fr'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -2415,9 +2400,6 @@ $result_trees{'formatting_fr'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => 'formatting.texi',
@@ -2455,9 +2437,6 @@ $result_trees{'formatting_fr'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -2843,9 +2822,6 @@ $result_trees{'formatting_fr'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => 'formatting.texi',
@@ -2883,9 +2859,6 @@ $result_trees{'formatting_fr'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -3134,9 +3107,6 @@ $result_trees{'formatting_fr'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -3630,7 +3600,6 @@ 
$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'par
 
$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2];
-$result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'formatting_fr'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[0];
 $result_trees{'formatting_fr'}{'contents'}[0]{'parent'} = 
$result_trees{'formatting_fr'};
 
$result_trees{'formatting_fr'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[1]{'args'}[0];
@@ -3674,7 +3643,6 @@ 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'par
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -3688,7 +3656,6 @@ 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'par
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7];
@@ -3727,7 +3694,6 @@ 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'par
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'contents'}[9]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'contents'}[9];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'contents'}[9]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'contents'}[9];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[8]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[9];
@@ -3747,7 +3713,6 @@ 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'pa
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15];
-$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[15]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[16]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[2]{'contents'}[17]{'args'}[0];
@@ -3907,12 +3872,10 @@ 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'con
 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3];
-$result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 $result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[4];
 $result_trees{'formatting_fr'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[4];
 $result_trees{'formatting_fr'}{'contents'}[4]{'parent'} = 
$result_trees{'formatting_fr'};
@@ -3973,12 +3936,10 @@ 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'con
 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3];
 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2];
-$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3];
 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1];
 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 
$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1];
-$result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 $result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[6];
 $result_trees{'formatting_fr'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[6];
 $result_trees{'formatting_fr'}{'contents'}[6]{'parent'} = 
$result_trees{'formatting_fr'};
@@ -4014,7 +3975,6 @@ 
$result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'par
 
$result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 
$result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1];
-$result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 $result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[8];
 $result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[2]{'parent'} = 
$result_trees{'formatting_fr'}{'contents'}[8];
 
$result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'formatting_fr'}{'contents'}[8]{'contents'}[3]{'args'}[0];
@@ -4451,8 +4411,7 @@ $result_nodes{'formatting_fr'} = {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index f4093b6a1b..de4bc90bc7 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -521,9 +521,6 @@ $result_trees{'texi_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -805,9 +802,6 @@ $result_trees{'texi_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -916,9 +910,6 @@ $result_trees{'texi_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -1216,9 +1207,6 @@ $result_trees{'texi_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -1354,9 +1342,6 @@ $result_trees{'texi_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -2415,9 +2400,6 @@ $result_trees{'texi_formatting'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => 'formatting.texi',
@@ -2455,9 +2437,6 @@ $result_trees{'texi_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -2843,9 +2822,6 @@ $result_trees{'texi_formatting'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => 'formatting.texi',
@@ -2883,9 +2859,6 @@ $result_trees{'texi_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -3134,9 +3107,6 @@ $result_trees{'texi_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'formatting.texi',
@@ -3630,7 +3600,6 @@ 
$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'p
 
$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2];
-$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'texi_formatting'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[0];
 $result_trees{'texi_formatting'}{'contents'}[0]{'parent'} = 
$result_trees{'texi_formatting'};
 
$result_trees{'texi_formatting'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[1]{'args'}[0];
@@ -3674,7 +3643,6 @@ 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'p
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -3688,7 +3656,6 @@ 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'p
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7];
@@ -3727,7 +3694,6 @@ 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'p
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'contents'}[9]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'contents'}[9];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'contents'}[9]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'contents'}[9];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[8]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[9];
@@ -3747,7 +3713,6 @@ 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'contents'}[0]{'
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15];
-$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[15]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[16]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[2]{'contents'}[17]{'args'}[0];
@@ -3907,12 +3872,10 @@ 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'c
 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3];
-$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 $result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[4];
 $result_trees{'texi_formatting'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[4];
 $result_trees{'texi_formatting'}{'contents'}[4]{'parent'} = 
$result_trees{'texi_formatting'};
@@ -3973,12 +3936,10 @@ 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'c
 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3];
 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2];
-$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'contents'}[3];
 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1];
 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1];
-$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 $result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[6];
 $result_trees{'texi_formatting'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[6];
 $result_trees{'texi_formatting'}{'contents'}[6]{'parent'} = 
$result_trees{'texi_formatting'};
@@ -4014,7 +3975,6 @@ 
$result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'p
 
$result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 
$result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1];
-$result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 $result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[8];
 $result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[2]{'parent'} = 
$result_trees{'texi_formatting'}{'contents'}[8];
 
$result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'texi_formatting'}{'contents'}[8]{'contents'}[3]{'args'}[0];
@@ -4451,8 +4411,7 @@ $result_nodes{'texi_formatting'} = {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/moreindices/double_index_entry.pl 
b/tp/t/results/moreindices/double_index_entry.pl
index 6331ca30a6..860a1e43e8 100644
--- a/tp/t/results/moreindices/double_index_entry.pl
+++ b/tp/t/results/moreindices/double_index_entry.pl
@@ -267,9 +267,6 @@ $result_trees{'double_index_entry'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'double_index_entry.texi',
@@ -510,7 +507,6 @@ 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7];
-$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[8]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
 $result_trees{'double_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -579,8 +575,7 @@ $result_nodes{'double_index_entry'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/moreindices/index_split.pl 
b/tp/t/results/moreindices/index_split.pl
index a8ef4cad7d..05309de1c9 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -529,9 +529,6 @@ $result_trees{'index_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'index_split.texi',
@@ -1441,9 +1438,6 @@ $result_trees{'index_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'index_split.texi',
@@ -1740,9 +1734,6 @@ $result_trees{'index_split'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'index_split.texi',
@@ -3191,7 +3182,6 @@ 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[2]{'pare
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[3];
 
$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'parent'}
 = $result_trees{'index_split'}{'contents'}[2]{'contents'}[10];
-$result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'extra'}{'end_command'}
 = $result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'contents'}[3];
 $result_trees{'index_split'}{'contents'}[2]{'contents'}[10]{'parent'} = 
$result_trees{'index_split'}{'contents'}[2];
 $result_trees{'index_split'}{'contents'}[2]{'contents'}[11]{'parent'} = 
$result_trees{'index_split'}{'contents'}[2];
 $result_trees{'index_split'}{'contents'}[2]{'parent'} = 
$result_trees{'index_split'};
@@ -3336,7 +3326,6 @@ 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{'paren
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[6];
 
$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[4];
-$result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'contents'}[6];
 $result_trees{'index_split'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'index_split'}{'contents'}[4];
 $result_trees{'index_split'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'index_split'}{'contents'}[4];
 $result_trees{'index_split'}{'contents'}[4]{'parent'} = 
$result_trees{'index_split'};
@@ -3380,7 +3369,6 @@ 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'paren
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[2];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[3];
-$result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'contents'}[2];
 $result_trees{'index_split'}{'contents'}[6]{'contents'}[3]{'parent'} = 
$result_trees{'index_split'}{'contents'}[6];
 
$result_trees{'index_split'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'index_split'}{'contents'}[6]{'contents'}[4];
 $result_trees{'index_split'}{'contents'}[6]{'contents'}[4]{'parent'} = 
$result_trees{'index_split'}{'contents'}[6];
@@ -3971,8 +3959,7 @@ $result_nodes{'index_split'} = {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3992,8 +3979,7 @@ $result_nodes{'index_split'} = {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first'
@@ -4012,8 +3998,7 @@ $result_nodes{'index_split'} = {
             'isindex' => 1,
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section-1'
diff --git a/tp/t/results/moreindices/index_split_nodes.pl 
b/tp/t/results/moreindices/index_split_nodes.pl
index 932e114ee1..30f3bebcba 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -529,9 +529,6 @@ $result_trees{'index_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'index_split.texi',
@@ -1441,9 +1438,6 @@ $result_trees{'index_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'index_split.texi',
@@ -1740,9 +1734,6 @@ $result_trees{'index_split_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'index_split.texi',
@@ -3191,7 +3182,6 @@ 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[2]
 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[3];
 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[3]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10];
-$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10]{'contents'}[3];
 $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[10]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[2];
 $result_trees{'index_split_nodes'}{'contents'}[2]{'contents'}[11]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[2];
 $result_trees{'index_split_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'index_split_nodes'};
@@ -3336,7 +3326,6 @@ 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[5]{
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[6];
 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4];
-$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[6];
 $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[4];
 $result_trees{'index_split_nodes'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[4];
 $result_trees{'index_split_nodes'}{'contents'}[4]{'parent'} = 
$result_trees{'index_split_nodes'};
@@ -3380,7 +3369,6 @@ 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[2];
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3];
-$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'contents'}[2];
 $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[3]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[6];
 
$result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[4];
 $result_trees{'index_split_nodes'}{'contents'}[6]{'contents'}[4]{'parent'} = 
$result_trees{'index_split_nodes'}{'contents'}[6];
@@ -3971,8 +3959,7 @@ $result_nodes{'index_split_nodes'} = {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3992,8 +3979,7 @@ $result_nodes{'index_split_nodes'} = {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first'
@@ -4012,8 +3998,7 @@ $result_nodes{'index_split_nodes'} = {
             'isindex' => 1,
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section-1'
diff --git a/tp/t/results/moreindices/nodes_before_top.pl 
b/tp/t/results/moreindices/nodes_before_top.pl
index ce3ea0c809..2f3ca5be08 100644
--- a/tp/t/results/moreindices/nodes_before_top.pl
+++ b/tp/t/results/moreindices/nodes_before_top.pl
@@ -326,9 +326,6 @@ $result_trees{'nodes_before_top'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -910,9 +907,6 @@ $result_trees{'nodes_before_top'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -1280,9 +1274,6 @@ $result_trees{'nodes_before_top'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -1530,9 +1521,6 @@ $result_trees{'nodes_before_top'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -2194,7 +2182,6 @@ 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -2277,7 +2264,6 @@ 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10];
-$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[10]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[3];
 $result_trees{'nodes_before_top'}{'contents'}[3]{'contents'}[11]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[3];
 $result_trees{'nodes_before_top'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -2333,7 +2319,6 @@ 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[4];
 $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[5]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[4];
 $result_trees{'nodes_before_top'}{'contents'}[4]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -2371,7 +2356,6 @@ 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[1]{'
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0];
-$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
 $result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[5];
 $result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[5];
 
$result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[5]{'contents'}[2]{'args'}[0];
@@ -2581,8 +2565,7 @@ $result_nodes{'nodes_before_top'} = {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -2594,8 +2577,7 @@ $result_nodes{'nodes_before_top'} = {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first'
@@ -2607,8 +2589,7 @@ $result_nodes{'nodes_before_top'} = {
             'isindex' => 1,
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'second'
@@ -2647,8 +2628,7 @@ $result_nodes{'nodes_before_top'} = {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first-before-top'
diff --git 
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl 
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
index 7f9e6061f9..159f02767a 100644
--- a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
+++ b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
@@ -385,9 +385,6 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
@@ -1213,9 +1210,6 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
@@ -1563,9 +1557,6 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
@@ -1813,9 +1804,6 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top_and_sections.texi',
@@ -2774,7 +2762,6 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'conten
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[7];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -2897,7 +2884,6 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'conten
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[4]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[4]{'contents'}[3]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[4];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[4]{'contents'}[3];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'};
@@ -2950,7 +2936,6 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'conten
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[4];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'contents'}[5]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -2988,7 +2973,6 @@ 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'conten
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[0];
-$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6];
 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[6]{'contents'}[2]{'args'}[0];
@@ -3333,8 +3317,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3346,8 +3329,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first'
@@ -3359,8 +3341,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
             'isindex' => 1,
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'second'
@@ -3399,8 +3380,7 @@ $result_nodes{'nodes_before_top_and_sections_monolithic'} 
= {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first-before-top'
diff --git a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
index 8f4825d107..2967c71fd1 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
@@ -326,9 +326,6 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -910,9 +907,6 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -1280,9 +1274,6 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -1530,9 +1521,6 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -2194,7 +2182,6 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3]{'conten
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -2277,7 +2264,6 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10]{'conte
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[10]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'contents'}[11]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -2333,7 +2319,6 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4]{'conten
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -2371,7 +2356,6 @@ 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0]{'conten
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0];
-$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[5];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_no_nodes'}{'contents'}[5];
 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[5]{'contents'}[2]{'args'}[0];
@@ -2581,8 +2565,7 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -2594,8 +2577,7 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first'
@@ -2607,8 +2589,7 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
             'isindex' => 1,
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'second'
@@ -2647,8 +2628,7 @@ $result_nodes{'nodes_before_top_no_nodes'} = {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first-before-top'
diff --git a/tp/t/results/moreindices/nodes_before_top_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_nodes.pl
index cf520b686c..e12bd50904 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_nodes.pl
@@ -326,9 +326,6 @@ $result_trees{'nodes_before_top_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -910,9 +907,6 @@ $result_trees{'nodes_before_top_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -1280,9 +1274,6 @@ $result_trees{'nodes_before_top_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -1530,9 +1521,6 @@ $result_trees{'nodes_before_top_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_before_top.texi',
@@ -2194,7 +2182,6 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3]{'contents'
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[3]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'contents'}[4]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -2277,7 +2264,6 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10]{'contents
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[10]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'contents'}[11]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[3];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -2333,7 +2319,6 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4]{'contents'
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4]{'contents'}[1];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[4]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'contents'}[5]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[4];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -2371,7 +2356,6 @@ 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0]{'contents'
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0];
-$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[0]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[5];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[1]{'parent'} 
= $result_trees{'nodes_before_top_nodes'}{'contents'}[5];
 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top_nodes'}{'contents'}[5]{'contents'}[2]{'args'}[0];
@@ -2581,8 +2565,7 @@ $result_nodes{'nodes_before_top_nodes'} = {
     'isindex' => 1,
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -2594,8 +2577,7 @@ $result_nodes{'nodes_before_top_nodes'} = {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first'
@@ -2607,8 +2589,7 @@ $result_nodes{'nodes_before_top_nodes'} = {
             'isindex' => 1,
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'second'
@@ -2647,8 +2628,7 @@ $result_nodes{'nodes_before_top_nodes'} = {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first-before-top'
diff --git a/tp/t/results/moreindices/split_chapter_index.pl 
b/tp/t/results/moreindices/split_chapter_index.pl
index c6f8840bcf..2c803382fa 100644
--- a/tp/t/results/moreindices/split_chapter_index.pl
+++ b/tp/t/results/moreindices/split_chapter_index.pl
@@ -309,9 +309,6 @@ $result_trees{'split_chapter_index'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
@@ -898,9 +895,6 @@ $result_trees{'split_chapter_index'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
@@ -1092,9 +1086,6 @@ $result_trees{'split_chapter_index'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'split_chapter_index.texi',
@@ -1412,7 +1403,6 @@ 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0
 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5];
-$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[5]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[2];
 $result_trees{'split_chapter_index'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[2];
 $result_trees{'split_chapter_index'}{'contents'}[2]{'parent'} = 
$result_trees{'split_chapter_index'};
@@ -1503,7 +1493,6 @@ 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11];
-$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'contents'}[1];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[11]{'parent'} 
= $result_trees{'split_chapter_index'}{'contents'}[4];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'contents'}[12]{'parent'} 
= $result_trees{'split_chapter_index'}{'contents'}[4];
 $result_trees{'split_chapter_index'}{'contents'}[4]{'parent'} = 
$result_trees{'split_chapter_index'};
@@ -1529,7 +1518,6 @@ 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[0
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1];
-$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[6];
 $result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'split_chapter_index'}{'contents'}[6];
 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'split_chapter_index'}{'contents'}[6]{'contents'}[3]{'args'}[0];
@@ -1764,8 +1752,7 @@ $result_nodes{'split_chapter_index'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1784,8 +1771,7 @@ $result_nodes{'split_chapter_index'} = {
         'isindex' => 1,
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first'
@@ -1803,8 +1789,7 @@ $result_nodes{'split_chapter_index'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section-1'
diff --git a/tp/t/results/moresectioning/equivalent_nodes.pl 
b/tp/t/results/moresectioning/equivalent_nodes.pl
index 2a489e516d..70935f815b 100644
--- a/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes.pl
@@ -353,9 +353,6 @@ $result_trees{'equivalent_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'equivalent_nodes.texi',
@@ -507,7 +504,6 @@ $result_trees{'equivalent_nodes'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -802,7 +798,6 @@ 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'
 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3];
-$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'equivalent_nodes'}{'contents'}[2];
 $result_trees{'equivalent_nodes'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'equivalent_nodes'}{'contents'}[2];
 $result_trees{'equivalent_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'equivalent_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -822,7 +817,6 @@ 
$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'
 
$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1];
-$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 $result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'equivalent_nodes'}{'contents'}[3];
 $result_trees{'equivalent_nodes'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'equivalent_nodes'}{'contents'}[3];
@@ -916,8 +910,7 @@ $result_nodes{'equivalent_nodes'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl 
b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
index 07fc7cb197..3d4de764ca 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
@@ -353,9 +353,6 @@ $result_trees{'equivalent_nodes_no_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'equivalent_nodes.texi',
@@ -507,7 +504,6 @@ $result_trees{'equivalent_nodes_no_node'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -802,7 +798,6 @@ 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'content
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'equivalent_nodes_no_node'}{'contents'}[2];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'equivalent_nodes_no_node'}{'contents'}[2];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -822,7 +817,6 @@ 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'content
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1];
-$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'equivalent_nodes_no_node'}{'contents'}[3];
 
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'equivalent_nodes_no_node'}{'contents'}[3];
@@ -916,8 +910,7 @@ $result_nodes{'equivalent_nodes_no_node'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 6e7cc00216..6b54a942ba 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -359,9 +359,6 @@ $result_trees{'more_sections_than_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'more_sections_than_nodes.texi',
@@ -757,9 +754,6 @@ $result_trees{'more_sections_than_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'more_sections_than_nodes.texi',
@@ -1259,7 +1253,6 @@ 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'content
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[2];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[2];
 $result_trees{'more_sections_than_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'more_sections_than_nodes'};
@@ -1311,7 +1304,6 @@ 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'content
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1];
-$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[8];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[8];
 $result_trees{'more_sections_than_nodes'}{'contents'}[8]{'parent'} = 
$result_trees{'more_sections_than_nodes'};
@@ -1695,8 +1687,7 @@ $result_nodes{'more_sections_than_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1727,8 +1718,7 @@ $result_nodes{'more_sections_than_nodes'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'n-c3'
diff --git a/tp/t/results/moresectioning/node_footnote_end.pl 
b/tp/t/results/moresectioning/node_footnote_end.pl
index e7353d842b..c1b845a52c 100644
--- a/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/tp/t/results/moresectioning/node_footnote_end.pl
@@ -429,9 +429,6 @@ $result_trees{'node_footnote_end'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'node_footnote.texi',
@@ -989,9 +986,6 @@ $result_trees{'node_footnote_end'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'node_footnote.texi',
@@ -1262,7 +1256,6 @@ 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{
 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 $result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'node_footnote_end'}{'contents'}[1];
 $result_trees{'node_footnote_end'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'node_footnote_end'}{'contents'}[1];
 $result_trees{'node_footnote_end'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'node_footnote_end'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -1340,7 +1333,6 @@ 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{
 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1];
-$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'contents'}[1];
 $result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[1]{'parent'} = 
$result_trees{'node_footnote_end'}{'contents'}[5];
 $result_trees{'node_footnote_end'}{'contents'}[5]{'contents'}[2]{'parent'} = 
$result_trees{'node_footnote_end'}{'contents'}[5];
 $result_trees{'node_footnote_end'}{'contents'}[5]{'parent'} = 
$result_trees{'node_footnote_end'};
@@ -1467,8 +1459,7 @@ $result_nodes{'node_footnote_end'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1498,8 +1489,7 @@ $result_nodes{'node_footnote_end'} = {
                 },
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'chapter'
diff --git a/tp/t/results/moresectioning/node_footnote_separated.pl 
b/tp/t/results/moresectioning/node_footnote_separated.pl
index ab7c231529..c563443c05 100644
--- a/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -429,9 +429,6 @@ $result_trees{'node_footnote_separated'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'node_footnote.texi',
@@ -989,9 +986,6 @@ $result_trees{'node_footnote_separated'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'node_footnote.texi',
@@ -1262,7 +1256,6 @@ 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents
 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1];
-$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'node_footnote_separated'}{'contents'}[1];
 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'node_footnote_separated'}{'contents'}[1];
 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_separated'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -1340,7 +1333,6 @@ 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents
 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1];
-$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'node_footnote_separated'}{'contents'}[5];
 
$result_trees{'node_footnote_separated'}{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'node_footnote_separated'}{'contents'}[5];
 $result_trees{'node_footnote_separated'}{'contents'}[5]{'parent'} = 
$result_trees{'node_footnote_separated'};
@@ -1467,8 +1459,7 @@ $result_nodes{'node_footnote_separated'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1498,8 +1489,7 @@ $result_nodes{'node_footnote_separated'} = {
                 },
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'chapter'
diff --git a/tp/t/results/moresectioning/node_footnote_use_node.pl 
b/tp/t/results/moresectioning/node_footnote_use_node.pl
index 56f8a36261..c673216c06 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -429,9 +429,6 @@ $result_trees{'node_footnote_use_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'node_footnote.texi',
@@ -989,9 +986,6 @@ $result_trees{'node_footnote_use_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'node_footnote.texi',
@@ -1262,7 +1256,6 @@ 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1];
-$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'node_footnote_use_node'}{'contents'}[1];
 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'node_footnote_use_node'}{'contents'}[1];
 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -1340,7 +1333,6 @@ 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'
 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1];
-$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[1]{'parent'} 
= $result_trees{'node_footnote_use_node'}{'contents'}[5];
 
$result_trees{'node_footnote_use_node'}{'contents'}[5]{'contents'}[2]{'parent'} 
= $result_trees{'node_footnote_use_node'}{'contents'}[5];
 $result_trees{'node_footnote_use_node'}{'contents'}[5]{'parent'} = 
$result_trees{'node_footnote_use_node'};
@@ -1467,8 +1459,7 @@ $result_nodes{'node_footnote_use_node'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1498,8 +1489,7 @@ $result_nodes{'node_footnote_use_node'} = {
                 },
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'chapter'
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
index 56c713a586..7ff33e0298 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -272,9 +272,6 @@ $result_trees{'nodes_after_top_before_chapter'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_after_top_before_chapter.texi',
@@ -602,7 +599,6 @@ 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'c
 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -716,8 +712,7 @@ $result_nodes{'nodes_after_top_before_chapter'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
index 5271671fc1..d2fa2b9735 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
@@ -272,9 +272,6 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_after_top_before_chapter.texi',
@@ -602,7 +599,6 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]
 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -716,8 +712,7 @@ 
$result_nodes{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_section.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
index 8e9dd5a394..f85b828cf6 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -272,9 +272,6 @@ $result_trees{'nodes_after_top_before_section'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_after_top_before_section.texi',
@@ -602,7 +599,6 @@ 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'c
 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_section'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_after_top_before_section'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -716,8 +712,7 @@ $result_nodes{'nodes_after_top_before_section'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
index e954c9bf0a..eb3ce0a491 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
@@ -272,9 +272,6 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_after_top_before_section.texi',
@@ -602,7 +599,6 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'conten
 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -716,8 +712,7 @@ $result_nodes{'nodes_after_top_before_section_use_nodes'} = 
{
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
index fc196bb836..45af0be3d7 100644
--- 
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
+++ 
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
@@ -272,9 +272,6 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodes_after_top_before_section.texi',
@@ -602,7 +599,6 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]
 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -716,8 +712,7 @@ 
$result_nodes{'nodes_after_top_before_section_use_nodes_chapter'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 97afddc513..56cca937ed 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -454,7 +454,6 @@ $result_trees{'placed_things_before_element'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -631,9 +630,6 @@ $result_trees{'placed_things_before_element'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'placed_things_before_element.texi',
@@ -920,7 +916,6 @@ 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'co
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'contents'}[1];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'args'}[1]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
@@ -947,7 +942,6 @@ 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'co
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[17]{'args'}[0];
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl 
b/tp/t/results/moresectioning/sectioning_frames.pl
index b7bb970b8d..d6af36bc67 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -663,9 +663,6 @@ $result_trees{'sectioning_frames'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'sectioning.texi',
@@ -1036,9 +1033,6 @@ $result_trees{'sectioning_frames'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'sectioning.texi',
@@ -1401,9 +1395,6 @@ $result_trees{'sectioning_frames'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'sectioning.texi',
@@ -1903,9 +1894,6 @@ $result_trees{'sectioning_frames'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'sectioning.texi',
@@ -2664,7 +2652,6 @@ 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[8]{
 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'args'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[9];
 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0];
-$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'contents'}[9];
 $result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[2];
 $result_trees{'sectioning_frames'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[2];
 $result_trees{'sectioning_frames'}{'contents'}[2]{'parent'} = 
$result_trees{'sectioning_frames'};
@@ -2722,7 +2709,6 @@ 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{
 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2];
-$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
 $result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[4];
 $result_trees{'sectioning_frames'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[4];
 $result_trees{'sectioning_frames'}{'contents'}[4]{'parent'} = 
$result_trees{'sectioning_frames'};
@@ -2778,7 +2764,6 @@ 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{
 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[4];
 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1];
-$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'contents'}[4];
 $result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[6];
 $result_trees{'sectioning_frames'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[6];
 $result_trees{'sectioning_frames'}{'contents'}[6]{'parent'} = 
$result_trees{'sectioning_frames'};
@@ -2840,7 +2825,6 @@ 
$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[0]
 
$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[1];
 
$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1];
-$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'contents'}[1];
 $result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[1]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[16];
 $result_trees{'sectioning_frames'}{'contents'}[16]{'contents'}[2]{'parent'} = 
$result_trees{'sectioning_frames'}{'contents'}[16];
 $result_trees{'sectioning_frames'}{'contents'}[16]{'parent'} = 
$result_trees{'sectioning_frames'};
@@ -3373,8 +3357,7 @@ $result_nodes{'sectioning_frames'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -3392,8 +3375,7 @@ $result_nodes{'sectioning_frames'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'First-node'
@@ -3409,8 +3391,7 @@ $result_nodes{'sectioning_frames'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'unnumbered'
@@ -3485,8 +3466,7 @@ $result_nodes{'sectioning_frames'} = {
                 },
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'unnumbered2'
diff --git a/tp/t/results/moresectioning/top_node_up_explicit.pl 
b/tp/t/results/moresectioning/top_node_up_explicit.pl
index 7cb7a1d1b3..52a5424757 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_explicit.pl
@@ -374,9 +374,6 @@ $result_trees{'top_node_up_explicit'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'top_node_up_explicit.texi',
@@ -564,7 +561,6 @@ 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[
 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3];
-$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'top_node_up_explicit'}{'contents'}[2];
 $result_trees{'top_node_up_explicit'}{'contents'}[2]{'contents'}[4]{'parent'} 
= $result_trees{'top_node_up_explicit'}{'contents'}[2];
 $result_trees{'top_node_up_explicit'}{'contents'}[2]{'parent'} = 
$result_trees{'top_node_up_explicit'};
@@ -682,8 +678,7 @@ $result_nodes{'top_node_up_explicit'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/moresectioning/top_node_up_implicit.pl 
b/tp/t/results/moresectioning/top_node_up_implicit.pl
index f2e9ac766d..a3eb358228 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_implicit.pl
@@ -280,9 +280,6 @@ $result_trees{'top_node_up_implicit'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'top_node_up_implicit.texi',
@@ -453,7 +450,6 @@ 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[
 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3];
-$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'top_node_up_implicit'}{'contents'}[2];
 $result_trees{'top_node_up_implicit'}{'contents'}[2]{'contents'}[4]{'parent'} 
= $result_trees{'top_node_up_implicit'}{'contents'}[2];
 $result_trees{'top_node_up_implicit'}{'contents'}[2]{'parent'} = 
$result_trees{'top_node_up_implicit'};
@@ -570,8 +566,7 @@ $result_nodes{'top_node_up_implicit'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
index b01b3d237d..5e5b85daf8 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -377,9 +377,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'two_footnotes_in_nodes.texi',
@@ -682,7 +679,6 @@ 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5];
-$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[5]{'parent'} 
= $result_trees{'two_footnotes_in_nodes'}{'contents'}[2];
 
$result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'contents'}[6]{'parent'} 
= $result_trees{'two_footnotes_in_nodes'}{'contents'}[2];
 $result_trees{'two_footnotes_in_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'two_footnotes_in_nodes'};
@@ -832,8 +828,7 @@ $result_nodes{'two_footnotes_in_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
index 96274594cd..7bbbf9154f 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -377,9 +377,6 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'two_footnotes_in_nodes.texi',
@@ -682,7 +679,6 @@ 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5]{
 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0];
 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5];
-$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5]{'contents'}[1];
 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2];
 
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2];
 $result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[2]{'parent'} = 
$result_trees{'two_footnotes_in_nodes_separated'};
@@ -832,8 +828,7 @@ $result_nodes{'two_footnotes_in_nodes_separated'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/multitable/empty_headitem.pl 
b/tp/t/results/multitable/empty_headitem.pl
index bd419a0426..37434b5423 100644
--- a/tp/t/results/multitable/empty_headitem.pl
+++ b/tp/t/results/multitable/empty_headitem.pl
@@ -289,7 +289,6 @@ $result_trees{'empty_headitem'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 3,
             'spaces_before_argument' => ' '
           },
@@ -339,7 +338,6 @@ 
$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'ar
 
$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
 = 
$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_headitem'}{'contents'}[0];
 $result_trees{'empty_headitem'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_headitem'};
 
diff --git a/tp/t/results/multitable/empty_item_tab.pl 
b/tp/t/results/multitable/empty_item_tab.pl
index 96445e34e6..8966014ce2 100644
--- a/tp/t/results/multitable/empty_item_tab.pl
+++ b/tp/t/results/multitable/empty_item_tab.pl
@@ -226,7 +226,6 @@ $result_trees{'empty_item_tab'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 1,
             'spaces_before_argument' => ' '
           },
@@ -723,7 +722,6 @@ $result_trees{'empty_item_tab'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -767,7 +765,6 @@ 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'ar
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_item_tab'}{'contents'}[0];
 $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'empty_item_tab'}{'contents'}[0];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -828,7 +825,6 @@ 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'ar
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
 = 
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'empty_item_tab'}{'contents'}[0];
 $result_trees{'empty_item_tab'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_item_tab'};
 
diff --git a/tp/t/results/multitable/empty_multitable_with_cells.pl 
b/tp/t/results/multitable/empty_multitable_with_cells.pl
index 678af5742d..528a758385 100644
--- a/tp/t/results/multitable/empty_multitable_with_cells.pl
+++ b/tp/t/results/multitable/empty_multitable_with_cells.pl
@@ -122,7 +122,6 @@ $result_trees{'empty_multitable_with_cells'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 0,
             'prototypes' => []
           },
@@ -157,7 +156,6 @@ 
$result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_multitable_with_cells'}{'contents'}[0];
 $result_trees{'empty_multitable_with_cells'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_multitable_with_cells'};
 
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 40b78df74c..4b371b3d79 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -241,7 +241,6 @@ $result_trees{'inter_item_commands_in_multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -629,7 +628,6 @@ $result_trees{'inter_item_commands_in_multitable'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -800,7 +798,6 @@ $result_trees{'inter_item_commands_in_multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -864,7 +861,6 @@ 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0];
@@ -912,7 +908,6 @@ 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -935,7 +930,6 @@ 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4];
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0];
diff --git a/tp/t/results/multitable/multitable_begin_with_tab.pl 
b/tp/t/results/multitable/multitable_begin_with_tab.pl
index e28d056e3a..03e7019aa6 100644
--- a/tp/t/results/multitable/multitable_begin_with_tab.pl
+++ b/tp/t/results/multitable/multitable_begin_with_tab.pl
@@ -101,7 +101,6 @@ $result_trees{'multitable_begin_with_tab'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -265,7 +264,6 @@ $result_trees{'multitable_begin_with_tab'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -310,7 +308,6 @@ 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'multitable_begin_with_tab'}{'contents'}[0];
@@ -333,7 +330,6 @@ 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'conten
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2];
-$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'multitable_begin_with_tab'}{'contents'}[0];
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 477490584f..43ef386fcd 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
@@ -81,7 +81,6 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -122,7 +121,6 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'c
 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_bracketed_no_inter_space_prototype'}{'contents'}[0];
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 45f8a054f1..1a70e10f69 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
@@ -66,7 +66,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -95,7 +94,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'}{'contents'}[0]{'parent'}
 = $result_trees{'multitable_bracketed_prototype_empty_not_closed'};
 
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 3ac8fd6561..9ea056550d 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
@@ -81,7 +81,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -115,7 +114,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'conten
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'}{'contents'}[0]{'parent'}
 = $result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'};
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 f8837945f5..81d13b0baa 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
@@ -66,7 +66,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -95,7 +94,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'content
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'}{'contents'}[0]{'parent'}
 = $result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'};
 
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 2c17ba3753..fbaf96ded7 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
@@ -84,7 +84,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -118,7 +117,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'};
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 6fc3c83483..9bd1262a65 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
@@ -71,7 +71,6 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -104,7 +103,6 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'conte
 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed'}{'contents'}[0]{'parent'}
 = $result_trees{'multitable_bracketed_prototype_not_closed'};
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 98aa8744e9..eece5ef8d1 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
@@ -85,7 +85,6 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -121,7 +120,6 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0
 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[1]
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'}{'contents'}[0];
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 97546ab269..6605dd5bf8 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
@@ -85,7 +85,6 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -121,7 +120,6 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'conten
 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[1]
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'}{'contents'}[0];
diff --git a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl 
b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
index afc37d3a87..43950b60d6 100644
--- a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
+++ b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
@@ -80,7 +80,6 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -118,7 +117,6 @@ 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}
 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0];
 $result_trees{'multitable_empty_bracketed_prototype'}{'contents'}[0]{'parent'} 
= $result_trees{'multitable_empty_bracketed_prototype'};
diff --git a/tp/t/results/multitable/multitable_figure_space.pl 
b/tp/t/results/multitable/multitable_figure_space.pl
index d3b2a99c77..fc42471577 100644
--- a/tp/t/results/multitable/multitable_figure_space.pl
+++ b/tp/t/results/multitable/multitable_figure_space.pl
@@ -265,7 +265,6 @@ $result_trees{'multitable_figure_space'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -336,7 +335,6 @@ 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'multitable_figure_space'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/multitable/multitable_in_example.pl 
b/tp/t/results/multitable/multitable_in_example.pl
index f5c2b3db86..09de1a0664 100644
--- a/tp/t/results/multitable/multitable_in_example.pl
+++ b/tp/t/results/multitable/multitable_in_example.pl
@@ -248,7 +248,6 @@ $result_trees{'multitable_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'max_columns' => 2,
                 'prototypes' => [
                   {
@@ -307,9 +306,6 @@ $result_trees{'multitable_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -354,7 +350,6 @@ 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -363,7 +358,6 @@ 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'multitable_in_example'}{'contents'}[0];
 $result_trees{'multitable_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'multitable_in_example'};
 
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 3855f4c930..b16d48cd61 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
@@ -316,7 +316,6 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -386,7 +385,6 @@ 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}
 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0];
 $result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'parent'} 
= $result_trees{'multitable_one_column_too_much_cells'};
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 6e30629e19..7782915d08 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
@@ -305,7 +305,6 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -362,7 +361,6 @@ 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'
 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
 = 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0];
 
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'parent'} 
= $result_trees{'multitable_two_columns_too_much_cells'};
 
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 5c5b028eae..39ce1c5af7 100644
--- a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
+++ b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
@@ -244,7 +244,6 @@ $result_trees{'multitable_with_empty_item_tab'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -288,7 +287,6 @@ 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0];
 $result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'parent'} = 
$result_trees{'multitable_with_empty_item_tab'};
 
diff --git a/tp/t/results/multitable/not_letters_in_prototype.pl 
b/tp/t/results/multitable/not_letters_in_prototype.pl
index 492f5c47d0..344b5a72aa 100644
--- a/tp/t/results/multitable/not_letters_in_prototype.pl
+++ b/tp/t/results/multitable/not_letters_in_prototype.pl
@@ -125,7 +125,6 @@ $result_trees{'not_letters_in_prototype'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -180,7 +179,6 @@ 
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0];
-$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'not_letters_in_prototype'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'not_letters_in_prototype'}{'contents'}[0];
 $result_trees{'not_letters_in_prototype'}{'contents'}[0]{'parent'} = 
$result_trees{'not_letters_in_prototype'};
 
diff --git a/tp/t/results/multitable/paragraph_in_cells.pl 
b/tp/t/results/multitable/paragraph_in_cells.pl
index 80116b7e89..905a342e33 100644
--- a/tp/t/results/multitable/paragraph_in_cells.pl
+++ b/tp/t/results/multitable/paragraph_in_cells.pl
@@ -242,7 +242,6 @@ $result_trees{'paragraph_in_cells'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -313,7 +312,6 @@ 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[0]
 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0];
-$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/multitable/prototype_brace_no_brace.pl 
b/tp/t/results/multitable/prototype_brace_no_brace.pl
index 3902f62114..f56d7bffe9 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace.pl
@@ -69,7 +69,6 @@ $result_trees{'prototype_brace_no_brace'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -117,7 +116,6 @@ 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'args'}[
 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0];
-$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'prototype_brace_no_brace'}{'contents'}[0];
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 83ccfa475b..66f6d0ba50 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -85,7 +85,6 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -135,7 +134,6 @@ 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0];
diff --git a/tp/t/results/multitable/prototype_no_brace.pl 
b/tp/t/results/multitable/prototype_no_brace.pl
index 75020b7597..ed5e8e9634 100644
--- a/tp/t/results/multitable/prototype_no_brace.pl
+++ b/tp/t/results/multitable/prototype_no_brace.pl
@@ -85,7 +85,6 @@ $result_trees{'prototype_no_brace'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 3,
             'prototypes' => [
               {
@@ -149,7 +148,6 @@ 
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'pa
 
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0];
-$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[1]
 = 
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
 $result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'prototype_no_brace'}{'contents'}[0];
 $result_trees{'prototype_no_brace'}{'contents'}[0]{'parent'} = 
$result_trees{'prototype_no_brace'};
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index bea12fae11..44be107675 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -488,7 +488,6 @@ $result_trees{'ref_in_multitable'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -623,7 +622,6 @@ 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'columnfractions'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'ref_in_multitable'}{'contents'}[0];
 $result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'ref_in_multitable'}{'contents'}[0];
 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
diff --git a/tp/t/results/multitable/w_in_multitable.pl 
b/tp/t/results/multitable/w_in_multitable.pl
index 1ea7a932fa..b0a8bc20fb 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -173,7 +173,6 @@ $result_trees{'w_in_multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -234,7 +233,6 @@ 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'p
 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0];
-$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'w_in_multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index 0935db64db..bf6b785a6d 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -84,9 +84,6 @@ $result_trees{'commands_in_flushright'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -161,7 +158,6 @@ $result_trees{'commands_in_flushright'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -280,7 +276,6 @@ $result_trees{'commands_in_flushright'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'enumerate_specification' => '1'
               },
               'parent' => {},
@@ -456,7 +451,6 @@ $result_trees{'commands_in_flushright'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -705,7 +699,6 @@ $result_trees{'commands_in_flushright'} = {
               ],
               'extra' => {
                 'columnfractions' => {},
-                'end_command' => {},
                 'max_columns' => 2,
                 'spaces_before_argument' => ' '
               },
@@ -843,7 +836,6 @@ $result_trees{'commands_in_flushright'} = {
               ],
               'extra' => {
                 'caption' => {},
-                'end_command' => {},
                 'node_content' => [
                   {}
                 ],
@@ -972,9 +964,6 @@ $result_trees{'commands_in_flushright'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1043,9 +1032,6 @@ $result_trees{'commands_in_flushright'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1114,9 +1100,6 @@ $result_trees{'commands_in_flushright'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1194,9 +1177,6 @@ $result_trees{'commands_in_flushright'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1219,7 +1199,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -1229,7 +1208,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
@@ -1243,7 +1221,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
@@ -1266,7 +1243,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -1298,7 +1274,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'extra'}{'columnfractions'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'args'}[0];
@@ -1319,7 +1294,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[5];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[5]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'extra'}{'caption'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[3];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[5];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'extra'}{'node_content'}[0]
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'args'}[1]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
@@ -1336,7 +1310,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[16];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[16]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18];
@@ -1345,7 +1318,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
@@ -1354,7 +1326,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'contents'}[1]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[20]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[21]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[22]{'args'}[0];
@@ -1364,7 +1335,6 @@ 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[24]{'args'}[0];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[24]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[24];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[24]{'parent'}
 = $result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[24];
 
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'commands_in_flushright'}{'contents'}[0];
 $result_trees{'commands_in_flushright'}{'contents'}[0]{'parent'} = 
$result_trees{'commands_in_flushright'};
 
diff --git a/tp/t/results/paragraph/comment_in_quotation.pl 
b/tp/t/results/paragraph/comment_in_quotation.pl
index d8216a3d59..d311328576 100644
--- a/tp/t/results/paragraph/comment_in_quotation.pl
+++ b/tp/t/results/paragraph/comment_in_quotation.pl
@@ -87,9 +87,6 @@ $result_trees{'comment_in_quotation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -175,9 +172,6 @@ $result_trees{'comment_in_quotation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -201,7 +195,6 @@ 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[
 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1];
-$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'comment_in_quotation'}{'contents'}[0];
 $result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'comment_in_quotation'}{'contents'}[0];
 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3];
@@ -212,7 +205,6 @@ 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[
 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3];
-$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 $result_trees{'comment_in_quotation'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'comment_in_quotation'}{'contents'}[0];
 $result_trees{'comment_in_quotation'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_in_quotation'};
 
diff --git a/tp/t/results/paragraph/paragraph_count_and_example.pl 
b/tp/t/results/paragraph/paragraph_count_and_example.pl
index 364fb16318..4cdc8cb162 100644
--- a/tp/t/results/paragraph/paragraph_count_and_example.pl
+++ b/tp/t/results/paragraph/paragraph_count_and_example.pl
@@ -64,9 +64,6 @@ $result_trees{'paragraph_count_and_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -104,7 +101,6 @@ 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'paragraph_count_and_example'}{'contents'}[0];
 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'paragraph_count_and_example'}{'contents'}[0];
 
$result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'paragraph_count_and_example'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/paragraph/paragraph_indent_asis.pl 
b/tp/t/results/paragraph/paragraph_indent_asis.pl
index 399deec25a..64644d49bb 100644
--- a/tp/t/results/paragraph/paragraph_indent_asis.pl
+++ b/tp/t/results/paragraph/paragraph_indent_asis.pl
@@ -133,9 +133,6 @@ $result_trees{'paragraph_indent_asis'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -172,7 +169,6 @@ 
$result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5]{'contents'}
 
$result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 
$result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5];
-$result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5]{'contents'}[2];
 $result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[5]{'parent'} 
= $result_trees{'paragraph_indent_asis'}{'contents'}[0];
 $result_trees{'paragraph_indent_asis'}{'contents'}[0]{'contents'}[6]{'parent'} 
= $result_trees{'paragraph_indent_asis'}{'contents'}[0];
 $result_trees{'paragraph_indent_asis'}{'contents'}[0]{'parent'} = 
$result_trees{'paragraph_indent_asis'};
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 3fde8ac330..cee366b02d 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
@@ -528,9 +528,6 @@ $result_trees{'at_commands_glued_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -625,7 +622,6 @@ 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'at_commands_glued_in_example'}{'contents'}[0];
 $result_trees{'at_commands_glued_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'at_commands_glued_in_example'};
 
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 5c09ae3e3b..de8e567527 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
@@ -70,9 +70,6 @@ $result_trees{'empty_line_in_example_end'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -111,7 +108,6 @@ 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_line_in_example_end'}{'contents'}[0];
 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_line_in_example_end'}{'contents'}[0];
 
$result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'empty_line_in_example_end'}{'contents'}[0]{'contents'}[2];
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 45eec82f01..48418ac3b2 100644
--- a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
+++ b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
@@ -93,7 +93,6 @@ $result_trees{'empty_multitable_in_itemize'} = {
                     }
                   ],
                   'extra' => {
-                    'end_command' => {},
                     'max_columns' => 0,
                     'prototypes' => []
                   },
@@ -153,7 +152,6 @@ $result_trees{'empty_multitable_in_itemize'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -179,14 +177,12 @@ 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_multitable_in_itemize'}{'contents'}[0];
 $result_trees{'empty_multitable_in_itemize'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_multitable_in_itemize'};
 
diff --git a/tp/t/results/plaintext_tests/expanded_tex.pl 
b/tp/t/results/plaintext_tests/expanded_tex.pl
index 4095ac399e..19e7ca53e9 100644
--- a/tp/t/results/plaintext_tests/expanded_tex.pl
+++ b/tp/t/results/plaintext_tests/expanded_tex.pl
@@ -81,9 +81,6 @@ $result_trees{'expanded_tex'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -116,7 +113,6 @@ 
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'cont
 
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0];
 $result_trees{'expanded_tex'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'expanded_tex'}{'contents'}[0];
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 a3ef2347e5..d78abd6e9c 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
@@ -95,9 +95,6 @@ $result_trees{'flushright_not_closed_and_format'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -130,7 +127,6 @@ 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'flushright_not_closed_and_format'}{'contents'}[0];
 $result_trees{'flushright_not_closed_and_format'}{'contents'}[0]{'parent'} = 
$result_trees{'flushright_not_closed_and_format'};
diff --git a/tp/t/results/plaintext_tests/html_expanded.pl 
b/tp/t/results/plaintext_tests/html_expanded.pl
index 83cd0573c4..60e35aa07f 100644
--- a/tp/t/results/plaintext_tests/html_expanded.pl
+++ b/tp/t/results/plaintext_tests/html_expanded.pl
@@ -71,9 +71,6 @@ $result_trees{'html_expanded'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -104,7 +101,6 @@ 
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'con
 
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0];
 $result_trees{'html_expanded'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'html_expanded'}{'contents'}[0];
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 59294924d7..a97b3363bb 100644
--- a/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
+++ b/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
@@ -64,9 +64,6 @@ $result_trees{'insert_copying_and_paragraph'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -121,7 +118,6 @@ 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0]{'con
 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0];
-$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'insert_copying_and_paragraph'}{'contents'}[0];
 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'insert_copying_and_paragraph'}{'contents'}[0];
 
$result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'insert_copying_and_paragraph'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/plaintext_tests/isolated_html_expanded.pl 
b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
index edf68b3ea5..901da54860 100644
--- a/tp/t/results/plaintext_tests/isolated_html_expanded.pl
+++ b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
@@ -70,9 +70,6 @@ $result_trees{'isolated_html_expanded'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -94,7 +91,6 @@ 
$result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'
 
$result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1];
-$result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'isolated_html_expanded'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'isolated_html_expanded'}{'contents'}[0];
 $result_trees{'isolated_html_expanded'}{'contents'}[0]{'parent'} = 
$result_trees{'isolated_html_expanded'};
 
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 83967d025f..2b37b2c9c7 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
@@ -97,8 +97,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
-                'end_command' => {}
+                'command_as_argument' => {}
               },
               'parent' => {},
               'source_info' => {
@@ -213,8 +212,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
-                'end_command' => {}
+                'command_as_argument' => {}
               },
               'parent' => {},
               'source_info' => {
@@ -335,8 +333,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
-                'end_command' => {}
+                'command_as_argument' => {}
               },
               'parent' => {},
               'source_info' => {
@@ -477,8 +474,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                 }
               ],
               'extra' => {
-                'command_as_argument' => {},
-                'end_command' => {}
+                'command_as_argument' => {}
               },
               'parent' => {},
               'source_info' => {
@@ -529,9 +525,6 @@ $result_trees{'itemize_in_headitem_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -557,7 +550,6 @@ 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
@@ -573,7 +565,6 @@ 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
@@ -590,7 +581,6 @@ 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
@@ -609,14 +599,12 @@ 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[2];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'args'}[0];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'parent'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8];
 
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
 $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'itemize_in_headitem_in_example'};
 
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 85fa750b3b..f1e61c76ad 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -401,9 +401,6 @@ $result_trees{'japanese_utf8'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'japanese_utf8.texi',
@@ -598,9 +595,6 @@ $result_trees{'japanese_utf8'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'japanese_utf8.texi',
@@ -885,7 +879,6 @@ 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'par
 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1];
-$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'japanese_utf8'}{'contents'}[2];
 $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'japanese_utf8'}{'contents'}[2];
 $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'japanese_utf8'}{'contents'}[2];
@@ -916,7 +909,6 @@ 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'par
 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[2];
 
$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6];
-$result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'contents'}[2];
 $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'japanese_utf8'}{'contents'}[2];
 $result_trees{'japanese_utf8'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'japanese_utf8'}{'contents'}[2];
 $result_trees{'japanese_utf8'}{'contents'}[2]{'parent'} = 
$result_trees{'japanese_utf8'};
@@ -1100,8 +1092,7 @@ $result_nodes{'japanese_utf8'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 882b90cecd..cbf9b3148d 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -127,9 +127,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -168,7 +165,6 @@ $result_trees{'line_passed_and_formats'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -264,9 +260,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -304,9 +297,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -400,9 +390,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -440,9 +427,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -511,9 +495,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -576,9 +557,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -647,9 +625,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -712,9 +687,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -808,9 +780,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -859,9 +828,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -955,9 +921,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1006,9 +969,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1102,9 +1062,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1153,9 +1110,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1235,9 +1189,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1328,9 +1279,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1433,9 +1381,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1538,9 +1483,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1680,9 +1622,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1726,9 +1665,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1828,9 +1764,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1874,9 +1807,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1994,9 +1924,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -2046,9 +1973,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2154,9 +2078,6 @@ $result_trees{'line_passed_and_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -2206,9 +2127,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2349,9 +2267,6 @@ $result_trees{'line_passed_and_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2411,12 +2326,10 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3];
@@ -2428,12 +2341,10 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5];
@@ -2445,12 +2356,10 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7];
@@ -2459,7 +2368,6 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'contents
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'contents'}[0];
@@ -2467,7 +2375,6 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'contents
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[9]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10];
@@ -2476,7 +2383,6 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[10]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'contents'}[0];
@@ -2484,7 +2390,6 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[12]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13];
@@ -2496,14 +2401,12 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[3]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[3]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[13]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[14]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15];
@@ -2515,14 +2418,12 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[3]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[3]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[15]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[16]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17];
@@ -2534,14 +2435,12 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[3]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[3]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[17]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[18]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[19]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[19];
@@ -2552,7 +2451,6 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[20]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[21]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[21];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[21]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
@@ -2565,7 +2463,6 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[24]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[25];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[25]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
@@ -2580,7 +2477,6 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28]{'contents'}[3]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28]{'contents'}[3]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[28]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[29];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[29]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
@@ -2595,7 +2491,6 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[32]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[33]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[33];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[33]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
@@ -2615,13 +2510,11 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[3]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[3]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[38]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[39]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[40]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[40];
@@ -2634,13 +2527,11 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[3]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[3]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[41]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[42]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[43];
@@ -2656,14 +2547,12 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[3]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[3]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[44]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[45]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[46];
@@ -2677,14 +2566,12 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[1];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[1]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[2];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[2]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[3]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[3]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'contents'}[3];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[47]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[48]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[49]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[49];
@@ -2707,7 +2594,6 @@ 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'content
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'args'}[0];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50];
-$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'extra'}{'end_command'}
 = 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[50]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51]{'contents'}[0]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51];
 
$result_trees{'line_passed_and_formats'}{'contents'}[1]{'contents'}[51]{'parent'}
 = $result_trees{'line_passed_and_formats'}{'contents'}[1];
@@ -2941,8 +2827,7 @@ $result_nodes{'line_passed_and_formats'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 43ed6db68e..89fa9a6e28 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -117,8 +117,7 @@ $result_trees{'long_uref_after_item'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -148,7 +147,6 @@ 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'long_uref_after_item'}{'contents'}[0];
 $result_trees{'long_uref_after_item'}{'contents'}[0]{'parent'} = 
$result_trees{'long_uref_after_item'};
 
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 ecaba70053..2d766abeca 100644
--- a/tp/t/results/plaintext_tests/multiline_image_and_align.pl
+++ b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
@@ -452,9 +452,6 @@ $result_trees{'multiline_image_and_align'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -525,7 +522,6 @@ 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'conten
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5]{'parent'}
 = $result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8];
-$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'contents'}[5];
 
$result_trees{'multiline_image_and_align'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'multiline_image_and_align'}{'contents'}[0];
 $result_trees{'multiline_image_and_align'}{'contents'}[0]{'parent'} = 
$result_trees{'multiline_image_and_align'};
 
diff --git a/tp/t/results/plaintext_tests/multitable.pl 
b/tp/t/results/plaintext_tests/multitable.pl
index 8419be23d8..7fc807c481 100644
--- a/tp/t/results/plaintext_tests/multitable.pl
+++ b/tp/t/results/plaintext_tests/multitable.pl
@@ -205,7 +205,6 @@ $result_trees{'multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -1158,7 +1157,6 @@ $result_trees{'multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -1445,7 +1443,6 @@ $result_trees{'multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -1613,7 +1610,6 @@ $result_trees{'multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 1,
             'prototypes' => [
               {
@@ -1846,7 +1842,6 @@ $result_trees{'multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -1902,7 +1897,6 @@ 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'multitable'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'multitable'}{'contents'}[0];
@@ -2016,7 +2010,6 @@ 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[2];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'multitable'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'multitable'}{'contents'}[0];
@@ -2052,7 +2045,6 @@ 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[4];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'multitable'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'multitable'}{'contents'}[0];
@@ -2073,7 +2065,6 @@ 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[6];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'multitable'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'multitable'}{'contents'}[0];
 $result_trees{'multitable'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'multitable'}{'contents'}[0];
@@ -2103,7 +2094,6 @@ 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[8];
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = $result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'multitable'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'multitable'}{'contents'}[0];
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 effa13b396..a63b149052 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
@@ -169,7 +169,6 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'max_columns' => 1,
                 'prototypes' => [
                   {
@@ -216,9 +215,6 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -252,12 +248,10 @@ 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}
 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0];
 $result_trees{'multitable_in_example_extraneous_tab'}{'contents'}[0]{'parent'} 
= $result_trees{'multitable_in_example_extraneous_tab'};
 
diff --git a/tp/t/results/plaintext_tests/nested_code_commands.pl 
b/tp/t/results/plaintext_tests/nested_code_commands.pl
index cffb92403a..c70c795d21 100644
--- a/tp/t/results/plaintext_tests/nested_code_commands.pl
+++ b/tp/t/results/plaintext_tests/nested_code_commands.pl
@@ -860,9 +860,6 @@ $result_trees{'nested_code_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1296,9 +1293,6 @@ $result_trees{'nested_code_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1433,7 +1427,6 @@ 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'nested_code_commands'}{'contents'}[0];
 $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'nested_code_commands'}{'contents'}[0];
 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4];
@@ -1494,7 +1487,6 @@ 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[
 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'nested_code_commands'}{'contents'}[0]{'contents'}[4]{'parent'} 
= $result_trees{'nested_code_commands'}{'contents'}[0];
 $result_trees{'nested_code_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_code_commands'};
 
diff --git a/tp/t/results/plaintext_tests/nested_indentedblock.pl 
b/tp/t/results/plaintext_tests/nested_indentedblock.pl
index 9c6118f84d..030247a455 100644
--- a/tp/t/results/plaintext_tests/nested_indentedblock.pl
+++ b/tp/t/results/plaintext_tests/nested_indentedblock.pl
@@ -89,9 +89,6 @@ $result_trees{'nested_indentedblock'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -129,9 +126,6 @@ $result_trees{'nested_indentedblock'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -230,9 +224,6 @@ $result_trees{'nested_indentedblock'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -270,9 +261,6 @@ $result_trees{'nested_indentedblock'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -296,12 +284,10 @@ 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'nested_indentedblock'}{'contents'}[0];
 $result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'nested_indentedblock'}{'contents'}[0];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2];
@@ -314,12 +300,10 @@ 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
-$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 $result_trees{'nested_indentedblock'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'nested_indentedblock'}{'contents'}[0];
 $result_trees{'nested_indentedblock'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_indentedblock'};
 
diff --git a/tp/t/results/plaintext_tests/nested_multitable.pl 
b/tp/t/results/plaintext_tests/nested_multitable.pl
index c22621793c..ababf21aec 100644
--- a/tp/t/results/plaintext_tests/nested_multitable.pl
+++ b/tp/t/results/plaintext_tests/nested_multitable.pl
@@ -214,7 +214,6 @@ $result_trees{'nested_multitable'} = {
                             }
                           ],
                           'extra' => {
-                            'end_command' => {},
                             'max_columns' => 2,
                             'prototypes' => [
                               {
@@ -383,7 +382,6 @@ $result_trees{'nested_multitable'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -445,7 +443,6 @@ 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -466,7 +463,6 @@ 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[1]
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'contents'}[2]
 = 
$result_trees{'nested_multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[2];
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 1dc0248846..a6798cbdb9 100644
--- a/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
+++ b/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
@@ -208,9 +208,6 @@ $result_trees{'protect_spaces_on_line'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -252,7 +249,6 @@ 
$result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3]{'contents'
 
$result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3];
-$result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'protect_spaces_on_line'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'protect_spaces_on_line'}{'contents'}[0];
 $result_trees{'protect_spaces_on_line'}{'contents'}[0]{'parent'} = 
$result_trees{'protect_spaces_on_line'};
 
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index f392746883..8d307187eb 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -1980,9 +1980,6 @@ $result_trees{'quote_node_names'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'nodequote.texi',
@@ -2571,7 +2568,6 @@ 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[5]{
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[6]{'args'}[0];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[6];
 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[6]{'parent'}
 = $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27];
-$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'contents'}[6];
 $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[27]{'parent'} = 
$result_trees{'quote_node_names'}{'contents'}[2];
 $result_trees{'quote_node_names'}{'contents'}[2]{'contents'}[28]{'parent'} = 
$result_trees{'quote_node_names'}{'contents'}[2];
 $result_trees{'quote_node_names'}{'contents'}[2]{'parent'} = 
$result_trees{'quote_node_names'};
@@ -2856,8 +2852,7 @@ $result_nodes{'quote_node_names'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 b26d290398..34e8b85e94 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
@@ -105,9 +105,6 @@ $result_trees{'sp_with_text_before_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -133,7 +130,6 @@ 
$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1]{'c
 
$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'sp_with_text_before_in_example'}{'contents'}[0];
 $result_trees{'sp_with_text_before_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'sp_with_text_before_in_example'};
 
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 5404e3273f..c74a4d7ea5 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -735,9 +735,6 @@ $result_trees{'star_at_command_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1083,9 +1080,6 @@ $result_trees{'star_at_command_formatting'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1242,7 +1236,6 @@ 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7]{'conte
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7];
-$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9];
@@ -1307,7 +1300,6 @@ 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'conte
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'contents'}[3]{'args'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'contents'}[3];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'contents'}[3]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9];
-$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'contents'}[3];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0];
 
$result_trees{'star_at_command_formatting'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'star_at_command_formatting'}{'contents'}[0];
 $result_trees{'star_at_command_formatting'}{'contents'}[0]{'parent'} = 
$result_trees{'star_at_command_formatting'};
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 ef4a3793e0..6e84c3c7aa 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
@@ -176,7 +176,6 @@ $result_trees{'tab_in_table_in_example'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -216,9 +215,6 @@ $result_trees{'tab_in_table_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -255,12 +251,10 @@ 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'tab_in_table_in_example'}{'contents'}[0];
 $result_trees{'tab_in_table_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'tab_in_table_in_example'};
 
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 1c29d0991d..21cd2a3cf4 100644
--- a/tp/t/results/plaintext_tests/tab_item_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_item_in_example.pl
@@ -85,9 +85,6 @@ $result_trees{'tab_item_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -112,7 +109,6 @@ 
$result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1
 
$result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'tab_item_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'tab_item_in_example'}{'contents'}[0];
 $result_trees{'tab_item_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'tab_item_in_example'};
 
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index a415b11c76..57226b8894 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -148,9 +148,6 @@ $result_trees{'caption_in_example'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -190,7 +187,6 @@ $result_trees{'caption_in_example'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -232,13 +228,11 @@ 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]
 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[3];
 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'caption'}
 = 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
 $result_trees{'caption_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'caption_in_example'}{'contents'}[0];
 $result_trees{'caption_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'caption_in_example'};
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 7fff489ee7..545b9b88b6 100644
--- a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
+++ b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
@@ -98,9 +98,6 @@ $result_trees{'comment_example_and_blank_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -203,9 +200,6 @@ $result_trees{'comment_example_and_blank_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -285,9 +279,6 @@ $result_trees{'comment_example_and_blank_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -373,9 +364,6 @@ $result_trees{'comment_example_and_blank_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -412,7 +400,6 @@ 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2]{'
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comment_example_and_blank_lines'}{'contents'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comment_example_and_blank_lines'}{'contents'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[4];
@@ -426,7 +413,6 @@ 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6]{'
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6];
-$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'comment_example_and_blank_lines'}{'contents'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'comment_example_and_blank_lines'}{'contents'}[0];
@@ -437,7 +423,6 @@ 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9]{'
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9];
-$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'comment_example_and_blank_lines'}{'contents'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'comment_example_and_blank_lines'}{'contents'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[11];
@@ -449,7 +434,6 @@ 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13]{
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13];
-$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'comment_example_and_blank_lines'}{'contents'}[0];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[14];
 
$result_trees{'comment_example_and_blank_lines'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'comment_example_and_blank_lines'}{'contents'}[0];
diff --git a/tp/t/results/preformatted/comments_in_example.pl 
b/tp/t/results/preformatted/comments_in_example.pl
index efe132f8dd..06b7af6183 100644
--- a/tp/t/results/preformatted/comments_in_example.pl
+++ b/tp/t/results/preformatted/comments_in_example.pl
@@ -114,9 +114,6 @@ $result_trees{'comments_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -213,9 +210,6 @@ $result_trees{'comments_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -323,9 +317,6 @@ $result_trees{'comments_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -353,7 +344,6 @@ 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'comments_in_example'}{'contents'}[0];
 $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'comments_in_example'}{'contents'}[0];
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[3];
@@ -366,7 +356,6 @@ 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4]{'contents'}[0
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4];
-$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'comments_in_example'}{'contents'}[0];
 $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'comments_in_example'}{'contents'}[0];
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[6];
@@ -381,7 +370,6 @@ 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[0
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7];
-$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 $result_trees{'comments_in_example'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'comments_in_example'}{'contents'}[0];
 $result_trees{'comments_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'comments_in_example'};
 
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index e0c50b8da4..62207b102c 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -166,7 +166,6 @@ $result_trees{'def_in_example'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -206,9 +205,6 @@ $result_trees{'def_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -244,12 +240,10 @@ 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'def_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'def_in_example'}{'contents'}[0];
 $result_trees{'def_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'def_in_example'};
 
diff --git a/tp/t/results/preformatted/empty_line.pl 
b/tp/t/results/preformatted/empty_line.pl
index 48f3a7ca19..b36c1d132e 100644
--- a/tp/t/results/preformatted/empty_line.pl
+++ b/tp/t/results/preformatted/empty_line.pl
@@ -75,9 +75,6 @@ $result_trees{'empty_line'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -100,7 +97,6 @@ 
$result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent
 
$result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'empty_line'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_line'}{'contents'}[0];
 $result_trees{'empty_line'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_line'};
 
diff --git a/tp/t/results/preformatted/empty_line_style_command.pl 
b/tp/t/results/preformatted/empty_line_style_command.pl
index c46c76cce4..da5751b6e6 100644
--- a/tp/t/results/preformatted/empty_line_style_command.pl
+++ b/tp/t/results/preformatted/empty_line_style_command.pl
@@ -101,9 +101,6 @@ $result_trees{'empty_line_style_command'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -130,7 +127,6 @@ 
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'empty_line_style_command'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_line_style_command'}{'contents'}[0];
 $result_trees{'empty_line_style_command'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_line_style_command'};
 
diff --git a/tp/t/results/preformatted/insertcopying_in_example.pl 
b/tp/t/results/preformatted/insertcopying_in_example.pl
index 034bf7c841..0a49869251 100644
--- a/tp/t/results/preformatted/insertcopying_in_example.pl
+++ b/tp/t/results/preformatted/insertcopying_in_example.pl
@@ -81,9 +81,6 @@ $result_trees{'insertcopying_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -106,7 +103,6 @@ 
$result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'insertcopying_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'insertcopying_in_example'}{'contents'}[0];
 $result_trees{'insertcopying_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'insertcopying_in_example'};
 
diff --git a/tp/t/results/preformatted/nested_example_and_comment.pl 
b/tp/t/results/preformatted/nested_example_and_comment.pl
index d1694fb35a..d07163a50b 100644
--- a/tp/t/results/preformatted/nested_example_and_comment.pl
+++ b/tp/t/results/preformatted/nested_example_and_comment.pl
@@ -106,9 +106,6 @@ $result_trees{'nested_example_and_comment'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -157,9 +154,6 @@ $result_trees{'nested_example_and_comment'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -287,9 +281,6 @@ $result_trees{'nested_example_and_comment'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -338,9 +329,6 @@ $result_trees{'nested_example_and_comment'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -468,9 +456,6 @@ $result_trees{'nested_example_and_comment'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -536,9 +521,6 @@ $result_trees{'nested_example_and_comment'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -564,14 +546,12 @@ 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'conte
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2];
@@ -587,14 +567,12 @@ 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'conte
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4];
@@ -610,7 +588,6 @@ 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'conte
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1];
@@ -619,7 +596,6 @@ 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'conte
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4];
-$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
 
$result_trees{'nested_example_and_comment'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'nested_example_and_comment'}{'contents'}[0];
 $result_trees{'nested_example_and_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_example_and_comment'};
 
diff --git a/tp/t/results/preformatted/nested_formats.pl 
b/tp/t/results/preformatted/nested_formats.pl
index a19a618e57..ff49e17f51 100644
--- a/tp/t/results/preformatted/nested_formats.pl
+++ b/tp/t/results/preformatted/nested_formats.pl
@@ -90,9 +90,6 @@ $result_trees{'nested_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -130,9 +127,6 @@ $result_trees{'nested_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -227,9 +221,6 @@ $result_trees{'nested_formats'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -267,9 +258,6 @@ $result_trees{'nested_formats'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -293,12 +281,10 @@ 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0];
-$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'nested_formats'}{'contents'}[0];
 $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'nested_formats'}{'contents'}[0];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2];
@@ -310,12 +296,10 @@ 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'co
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2];
-$result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'nested_formats'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'nested_formats'}{'contents'}[0];
 $result_trees{'nested_formats'}{'contents'}[0]{'parent'} = 
$result_trees{'nested_formats'};
 
diff --git a/tp/t/results/preformatted/page_in_example.pl 
b/tp/t/results/preformatted/page_in_example.pl
index 0bfe90886e..7d217ff329 100644
--- a/tp/t/results/preformatted/page_in_example.pl
+++ b/tp/t/results/preformatted/page_in_example.pl
@@ -76,9 +76,6 @@ $result_trees{'page_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -101,7 +98,6 @@ 
$result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'p
 
$result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'page_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'page_in_example'}{'contents'}[0];
 $result_trees{'page_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'page_in_example'};
 
diff --git a/tp/t/results/preformatted/quote_dash_in_display.pl 
b/tp/t/results/preformatted/quote_dash_in_display.pl
index f22a410eb9..890bd3ba79 100644
--- a/tp/t/results/preformatted/quote_dash_in_display.pl
+++ b/tp/t/results/preformatted/quote_dash_in_display.pl
@@ -76,9 +76,6 @@ $result_trees{'quote_dash_in_display'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -101,7 +98,6 @@ 
$result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}
 
$result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1];
-$result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'quote_dash_in_display'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'quote_dash_in_display'}{'contents'}[0];
 $result_trees{'quote_dash_in_display'}{'contents'}[0]{'parent'} = 
$result_trees{'quote_dash_in_display'};
 
diff --git a/tp/t/results/preformatted/quote_dash_in_example.pl 
b/tp/t/results/preformatted/quote_dash_in_example.pl
index 6f2e694d5e..2d120cb648 100644
--- a/tp/t/results/preformatted/quote_dash_in_example.pl
+++ b/tp/t/results/preformatted/quote_dash_in_example.pl
@@ -76,9 +76,6 @@ $result_trees{'quote_dash_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -101,7 +98,6 @@ 
$result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}
 
$result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'quote_dash_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'quote_dash_in_example'}{'contents'}[0];
 $result_trees{'quote_dash_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'quote_dash_in_example'};
 
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 4a0071a365..4df6fd4ba7 100644
--- a/tp/t/results/preformatted/text_on_display_command_line.pl
+++ b/tp/t/results/preformatted/text_on_display_command_line.pl
@@ -59,7 +59,6 @@ $result_trees{'text_on_display_command_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -136,7 +135,6 @@ $result_trees{'text_on_display_command_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -207,9 +205,6 @@ $result_trees{'text_on_display_command_line'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -281,9 +276,6 @@ $result_trees{'text_on_display_command_line'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -321,9 +313,6 @@ $result_trees{'text_on_display_command_line'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -343,7 +332,6 @@ 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'arg
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -353,7 +341,6 @@ 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'con
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4];
@@ -362,7 +349,6 @@ 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'con
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4];
-$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6];
@@ -370,12 +356,10 @@ 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'con
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6];
-$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'text_on_display_command_line'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'text_on_display_command_line'}{'contents'}[0];
 $result_trees{'text_on_display_command_line'}{'contents'}[0]{'parent'} = 
$result_trees{'text_on_display_command_line'};
 
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 a4a1193ab1..145580d8dc 100644
--- a/tp/t/results/preformatted/text_on_example_command_line.pl
+++ b/tp/t/results/preformatted/text_on_example_command_line.pl
@@ -59,7 +59,6 @@ $result_trees{'text_on_example_command_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -136,7 +135,6 @@ $result_trees{'text_on_example_command_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -207,9 +205,6 @@ $result_trees{'text_on_example_command_line'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -281,9 +276,6 @@ $result_trees{'text_on_example_command_line'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -321,9 +313,6 @@ $result_trees{'text_on_example_command_line'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -343,7 +332,6 @@ 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'arg
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -353,7 +341,6 @@ 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'con
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4];
@@ -362,7 +349,6 @@ 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'con
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4];
-$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6];
@@ -370,12 +356,10 @@ 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'con
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6];
-$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'text_on_example_command_line'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'text_on_example_command_line'}{'contents'}[0];
 $result_trees{'text_on_example_command_line'}{'contents'}[0]{'parent'} = 
$result_trees{'text_on_example_command_line'};
 
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl 
b/tp/t/results/preformatted/titlefont_in_example.pl
index 8afd0c9b15..9d65aca144 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -91,9 +91,6 @@ $result_trees{'titlefont_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -118,7 +115,6 @@ 
$result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'titlefont_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'titlefont_in_example'}{'contents'}[0];
 $result_trees{'titlefont_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'titlefont_in_example'};
 
diff --git a/tp/t/results/quotation/comment_on_quotation_line.pl 
b/tp/t/results/quotation/comment_on_quotation_line.pl
index 91f6389a27..494b2b71f0 100644
--- a/tp/t/results/quotation/comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/comment_on_quotation_line.pl
@@ -90,7 +90,6 @@ $result_trees{'comment_on_quotation_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -117,7 +116,6 @@ 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'conten
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_on_quotation_line'}{'contents'}[0];
 $result_trees{'comment_on_quotation_line'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_on_quotation_line'};
 
diff --git a/tp/t/results/quotation/empty_quotation.pl 
b/tp/t/results/quotation/empty_quotation.pl
index 8c83929052..4b4a0d05a6 100644
--- a/tp/t/results/quotation/empty_quotation.pl
+++ b/tp/t/results/quotation/empty_quotation.pl
@@ -53,9 +53,6 @@ $result_trees{'empty_quotation'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -119,7 +116,6 @@ $result_trees{'empty_quotation'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -198,7 +194,6 @@ $result_trees{'empty_quotation'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -264,7 +259,6 @@ $result_trees{'empty_quotation'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -285,7 +279,6 @@ 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'paren
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -293,7 +286,6 @@ 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'paren
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -302,7 +294,6 @@ 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'paren
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'args'}[0];
@@ -310,7 +301,6 @@ 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'paren
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6];
-$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'empty_quotation'}{'contents'}[0];
 $result_trees{'empty_quotation'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_quotation'};
 
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 f6cf022b1b..adcda242a4 100644
--- a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
+++ b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
@@ -102,7 +102,6 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -131,7 +130,6 @@ 
$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0];
-$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0];
 $result_trees{'footnote_in_quotation_with_arg'}{'contents'}[0]{'parent'} = 
$result_trees{'footnote_in_quotation_with_arg'};
 
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 efc66b18fa..dfa0a6f2d0 100644
--- a/tp/t/results/quotation/only_comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/only_comment_on_quotation_line.pl
@@ -81,7 +81,6 @@ $result_trees{'only_comment_on_quotation_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -106,7 +105,6 @@ 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'c
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'only_comment_on_quotation_line'}{'contents'}[0];
 $result_trees{'only_comment_on_quotation_line'}{'contents'}[0]{'parent'} = 
$result_trees{'only_comment_on_quotation_line'};
 
diff --git a/tp/t/results/quotation/quotation_and_author.pl 
b/tp/t/results/quotation/quotation_and_author.pl
index 20f8e10409..8a24831517 100644
--- a/tp/t/results/quotation/quotation_and_author.pl
+++ b/tp/t/results/quotation/quotation_and_author.pl
@@ -113,8 +113,7 @@ $result_trees{'quotation_and_author'} = {
           'extra' => {
             'authors' => [
               {}
-            ],
-            'end_command' => {}
+            ]
           },
           'parent' => {},
           'source_info' => {
@@ -233,8 +232,7 @@ $result_trees{'quotation_and_author'} = {
           'extra' => {
             'authors' => [
               {}
-            ],
-            'end_command' => {}
+            ]
           },
           'parent' => {},
           'source_info' => {
@@ -342,7 +340,6 @@ $result_trees{'quotation_and_author'} = {
             'authors' => [
               {}
             ],
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -373,7 +370,6 @@ 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[3]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[4];
@@ -390,7 +386,6 @@ 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'contents'}[
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'contents'}[2];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[6]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[7]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'args'}[0];
@@ -405,7 +400,6 @@ 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[0];
-$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'contents'}[2];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'contents'}[8]{'parent'} 
= $result_trees{'quotation_and_author'}{'contents'}[0];
 $result_trees{'quotation_and_author'}{'contents'}[0]{'parent'} = 
$result_trees{'quotation_and_author'};
 
diff --git a/tp/t/results/quotation/quotation_author_in_example.pl 
b/tp/t/results/quotation/quotation_author_in_example.pl
index 9f0f96cf0b..efb2a9fec1 100644
--- a/tp/t/results/quotation/quotation_author_in_example.pl
+++ b/tp/t/results/quotation/quotation_author_in_example.pl
@@ -110,8 +110,7 @@ $result_trees{'quotation_author_in_example'} = {
               'extra' => {
                 'authors' => [
                   {}
-                ],
-                'end_command' => {}
+                ]
               },
               'parent' => {},
               'source_info' => {
@@ -150,9 +149,6 @@ $result_trees{'quotation_author_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -179,12 +175,10 @@ 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'authors'}[0]
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'quotation_author_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_author_in_example'}{'contents'}[0];
 $result_trees{'quotation_author_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'quotation_author_in_example'};
 
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 e910bc3e40..5317a42a89 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,7 +55,6 @@ $result_trees{'quotation_beginning_and_end_on_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -77,7 +76,6 @@ 
$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[
 
$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0];
 $result_trees{'quotation_beginning_and_end_on_line'}{'contents'}[0]{'parent'} 
= $result_trees{'quotation_beginning_and_end_on_line'};
 
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 207a82710e..5d911bc74f 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
@@ -91,7 +91,6 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -200,7 +199,6 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -230,7 +228,6 @@ 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -248,7 +245,6 @@ 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0];
 $result_trees{'space_at_commands_end_quotation_line'}{'contents'}[0]{'parent'} 
= $result_trees{'space_at_commands_end_quotation_line'};
 
diff --git a/tp/t/results/quotation/standard_quotations.pl 
b/tp/t/results/quotation/standard_quotations.pl
index c3666807b1..0ef848637f 100644
--- a/tp/t/results/quotation/standard_quotations.pl
+++ b/tp/t/results/quotation/standard_quotations.pl
@@ -70,7 +70,6 @@ $result_trees{'standard_quotations'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -147,7 +146,6 @@ $result_trees{'standard_quotations'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -224,7 +222,6 @@ $result_trees{'standard_quotations'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -301,7 +298,6 @@ $result_trees{'standard_quotations'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -378,7 +374,6 @@ $result_trees{'standard_quotations'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -455,7 +450,6 @@ $result_trees{'standard_quotations'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -479,7 +473,6 @@ 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0];
-$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -489,7 +482,6 @@ 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'contents'}[0
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2];
-$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -499,7 +491,6 @@ 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'contents'}[0
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4];
-$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'args'}[0];
@@ -509,7 +500,6 @@ 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'contents'}[0
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6];
-$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'args'}[0];
@@ -519,7 +509,6 @@ 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'contents'}[0
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8];
-$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'standard_quotations'}{'contents'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'args'}[0];
@@ -529,7 +518,6 @@ 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'contents'}[
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10];
-$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 $result_trees{'standard_quotations'}{'contents'}[0]{'contents'}[10]{'parent'} 
= $result_trees{'standard_quotations'}{'contents'}[0];
 $result_trees{'standard_quotations'}{'contents'}[0]{'parent'} = 
$result_trees{'standard_quotations'};
 
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 619941656a..914b1448e3 100644
--- a/tp/t/results/raw/beginning_and_end_on_line.pl
+++ b/tp/t/results/raw/beginning_and_end_on_line.pl
@@ -61,7 +61,6 @@ $result_trees{'beginning_and_end_on_line'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -84,7 +83,6 @@ 
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'args'}
 
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'beginning_and_end_on_line'}{'contents'}[0];
 $result_trees{'beginning_and_end_on_line'}{'contents'}[0]{'parent'} = 
$result_trees{'beginning_and_end_on_line'};
 
diff --git a/tp/t/results/raw/braces_in_tex.pl 
b/tp/t/results/raw/braces_in_tex.pl
index 8c6e698e7d..2532319c45 100644
--- a/tp/t/results/raw/braces_in_tex.pl
+++ b/tp/t/results/raw/braces_in_tex.pl
@@ -98,9 +98,6 @@ $result_trees{'braces_in_tex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -219,9 +216,6 @@ $result_trees{'braces_in_tex'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -263,9 +257,6 @@ $result_trees{'braces_in_tex'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -299,7 +290,6 @@ 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'par
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1];
-$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'braces_in_tex'}{'contents'}[0];
 $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'braces_in_tex'}{'contents'}[0];
 $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'braces_in_tex'}{'contents'}[0];
@@ -316,13 +306,11 @@ 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'con
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4];
-$result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'braces_in_tex'}{'contents'}[0];
 $result_trees{'braces_in_tex'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'braces_in_tex'}{'contents'}[0];
 $result_trees{'braces_in_tex'}{'contents'}[0]{'parent'} = 
$result_trees{'braces_in_tex'};
diff --git a/tp/t/results/raw/displaymath.pl b/tp/t/results/raw/displaymath.pl
index a16b1e3790..9736ba8f3b 100644
--- a/tp/t/results/raw/displaymath.pl
+++ b/tp/t/results/raw/displaymath.pl
@@ -96,9 +96,6 @@ $result_trees{'displaymath'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -210,9 +207,6 @@ $result_trees{'displaymath'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -249,7 +243,6 @@ 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'paren
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[0];
-$result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'contents'}[5];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[2];
@@ -265,7 +258,6 @@ 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'paren
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'contents'}[5]{'args'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'contents'}[5];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'contents'}[5]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[3];
-$result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'contents'}[5];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
 
$result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'displaymath'}{'contents'}[0]{'contents'}[4];
 $result_trees{'displaymath'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'displaymath'}{'contents'}[0];
diff --git a/tp/t/results/raw/inline_in_example.pl 
b/tp/t/results/raw/inline_in_example.pl
index dbf7824fed..2ff1156c38 100644
--- a/tp/t/results/raw/inline_in_example.pl
+++ b/tp/t/results/raw/inline_in_example.pl
@@ -271,9 +271,6 @@ $result_trees{'inline_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -324,7 +321,6 @@ 
$result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{
 
$result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'inline_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'inline_in_example'}{'contents'}[0];
 $result_trees{'inline_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'inline_in_example'};
 
diff --git a/tp/t/results/raw/lone_braces_in_html.pl 
b/tp/t/results/raw/lone_braces_in_html.pl
index 2844919c01..221fa79d1f 100644
--- a/tp/t/results/raw/lone_braces_in_html.pl
+++ b/tp/t/results/raw/lone_braces_in_html.pl
@@ -64,9 +64,6 @@ $result_trees{'lone_braces_in_html'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -135,9 +132,6 @@ $result_trees{'lone_braces_in_html'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -158,7 +152,6 @@ 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0];
-$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'lone_braces_in_html'}{'contents'}[0];
 $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'lone_braces_in_html'}{'contents'}[0];
 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2];
@@ -167,7 +160,6 @@ 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'contents'}[0
 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2];
-$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'lone_braces_in_html'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'lone_braces_in_html'}{'contents'}[0];
 $result_trees{'lone_braces_in_html'}{'contents'}[0]{'parent'} = 
$result_trees{'lone_braces_in_html'};
 
diff --git a/tp/t/results/raw/misc_raw.pl b/tp/t/results/raw/misc_raw.pl
index d6d644b6f5..beb5abe424 100644
--- a/tp/t/results/raw/misc_raw.pl
+++ b/tp/t/results/raw/misc_raw.pl
@@ -69,9 +69,6 @@ $result_trees{'misc_raw'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -135,7 +132,6 @@ $result_trees{'misc_raw'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -203,7 +199,6 @@ 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1];
-$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'misc_raw'}{'contents'}[0];
 $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'misc_raw'}{'contents'}[0];
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -211,7 +206,6 @@ 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'} = $
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3];
-$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'misc_raw'}{'contents'}[0];
 $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'misc_raw'}{'contents'}[0];
 
$result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'misc_raw'}{'contents'}[0]{'contents'}[5];
diff --git a/tp/t/results/raw/misc_raw_comments.pl 
b/tp/t/results/raw/misc_raw_comments.pl
index 7a5b84e4ef..131cc78439 100644
--- a/tp/t/results/raw/misc_raw_comments.pl
+++ b/tp/t/results/raw/misc_raw_comments.pl
@@ -102,7 +102,6 @@ $result_trees{'misc_raw_comments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -185,7 +184,6 @@ $result_trees{'misc_raw_comments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -257,7 +255,6 @@ 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1];
-$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[0];
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'args'}[0];
@@ -267,7 +264,6 @@ 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3];
-$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[0];
 $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'misc_raw_comments'}{'contents'}[0];
 
$result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'misc_raw_comments'}{'contents'}[0]{'contents'}[5];
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 2d5c30be5e..dc354b531e 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
@@ -70,9 +70,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -153,9 +150,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -239,9 +233,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -325,9 +316,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -406,9 +394,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -492,9 +477,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -567,9 +549,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -645,9 +624,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -731,9 +707,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -817,9 +790,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -898,9 +868,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -984,9 +951,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -1339,7 +1303,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1]{'co
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3];
@@ -1350,7 +1313,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'co
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1362,7 +1324,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'co
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1374,7 +1335,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'co
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1385,7 +1345,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'co
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1397,7 +1356,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'c
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1407,7 +1365,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13]{'c
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15];
@@ -1417,7 +1374,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'c
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'contents'}[2]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1429,7 +1385,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'c
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'contents'}[2]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1441,7 +1396,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'c
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[20]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1452,7 +1406,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'c
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'contents'}[2]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[21]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
@@ -1464,7 +1417,6 @@ 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'c
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1];
-$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[23]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
 
$result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0]{'contents'}[24]{'parent'}
 = $result_trees{'raw_commands_and_end_of_lines'}{'contents'}[0];
diff --git a/tp/t/results/raw/raw_expanded_in_style.pl 
b/tp/t/results/raw/raw_expanded_in_style.pl
index 9ba274fdc1..baa58d7b04 100644
--- a/tp/t/results/raw/raw_expanded_in_style.pl
+++ b/tp/t/results/raw/raw_expanded_in_style.pl
@@ -75,9 +75,6 @@ $result_trees{'raw_expanded_in_style'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -117,7 +114,6 @@ 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_expanded_in_style'}{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/raw/raw_in_example.pl 
b/tp/t/results/raw/raw_in_example.pl
index f165e08fe0..8d9a29147f 100644
--- a/tp/t/results/raw/raw_in_example.pl
+++ b/tp/t/results/raw/raw_in_example.pl
@@ -80,9 +80,6 @@ $result_trees{'raw_in_example'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -124,9 +121,6 @@ $result_trees{'raw_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -229,9 +223,6 @@ $result_trees{'raw_in_example'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -340,9 +331,6 @@ $result_trees{'raw_in_example'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -390,9 +378,6 @@ $result_trees{'raw_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -420,13 +405,11 @@ 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_example'}{'contents'}[0];
 $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'raw_in_example'}{'contents'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2];
@@ -439,7 +422,6 @@ 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'co
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3];
@@ -456,14 +438,12 @@ 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'co
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3];
-$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2];
-$result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'raw_in_example'}{'contents'}[0];
 $result_trees{'raw_in_example'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'raw_in_example'}{'contents'}[0];
 $result_trees{'raw_in_example'}{'contents'}[0]{'parent'} = 
$result_trees{'raw_in_example'};
diff --git a/tp/t/results/raw/raw_in_para.pl b/tp/t/results/raw/raw_in_para.pl
index 744e904a5a..8cb55c1eef 100644
--- a/tp/t/results/raw/raw_in_para.pl
+++ b/tp/t/results/raw/raw_in_para.pl
@@ -120,9 +120,6 @@ $result_trees{'raw_in_para'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -218,9 +215,6 @@ $result_trees{'raw_in_para'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -271,7 +265,6 @@ 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'conte
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
-$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4];
 $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[0];
@@ -285,7 +278,6 @@ 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'conte
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
-$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6];
 $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[0];
 $result_trees{'raw_in_para'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'raw_in_para'}{'contents'}[0];
diff --git a/tp/t/results/raw/raw_in_style.pl b/tp/t/results/raw/raw_in_style.pl
index 81ff860d48..270973b192 100644
--- a/tp/t/results/raw/raw_in_style.pl
+++ b/tp/t/results/raw/raw_in_style.pl
@@ -75,9 +75,6 @@ $result_trees{'raw_in_style'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -117,7 +114,6 @@ 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args
 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw_in_style'}{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/raw/verbatim_and_verbatiminclude.pl 
b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
index 00c0b2da74..4c8303a08c 100644
--- a/tp/t/results/raw/verbatim_and_verbatiminclude.pl
+++ b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
@@ -200,9 +200,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -397,9 +394,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -582,9 +576,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -703,9 +694,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -823,9 +811,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -868,7 +853,6 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'con
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[3]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'contents'}[3];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[10];
@@ -894,7 +878,6 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17]{'co
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17]{'contents'}[2]{'args'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17]{'contents'}[2]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17]{'extra'}{'end_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17]{'contents'}[2];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[19]{'contents'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[19];
@@ -920,7 +903,6 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'co
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[4]{'args'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[4];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[4]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'extra'}{'end_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'contents'}[4];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[23]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[24]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'args'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25];
@@ -937,7 +919,6 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'co
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[5]{'args'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[5];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[5]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'contents'}[5];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[25]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[26]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'args'}[0]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27];
@@ -954,7 +935,6 @@ 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'co
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[5]{'args'}[0];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[5];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[5]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27];
-$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'contents'}[5];
 
$result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'contents'}[27]{'parent'}
 = $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0];
 $result_trees{'verbatim_and_verbatiminclude'}{'contents'}[0]{'parent'} = 
$result_trees{'verbatim_and_verbatiminclude'};
 
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index 16098dccc4..9ea225428e 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -127,9 +127,6 @@ $result_trees{'anchor_in_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -360,7 +357,6 @@ 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3];
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3];
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1];
 $result_trees{'anchor_in_copying'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'anchor_in_copying'}{'contents'}[0];
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 b7864e5a4d..9115216798 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -152,9 +152,6 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -388,7 +385,6 @@ 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_in_copying_in_footnote'}{'contents'}[0];
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 2e3ec5cab2..f7bdd31a35 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -98,9 +98,6 @@ $result_trees{'anchor_in_titlepage'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -332,7 +329,6 @@ 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0];
 $result_trees{'anchor_in_titlepage'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'anchor_in_titlepage'}{'contents'}[0];
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 9f5af5c9ab..828f8be3ca 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -98,9 +98,6 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -332,7 +329,6 @@ 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'anchor_in_titlepage_titlepage'}{'contents'}[0];
diff --git a/tp/t/results/regions/double_copying.pl 
b/tp/t/results/regions/double_copying.pl
index 93bc2df9f9..49629ecc53 100644
--- a/tp/t/results/regions/double_copying.pl
+++ b/tp/t/results/regions/double_copying.pl
@@ -101,9 +101,6 @@ $result_trees{'double_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -141,9 +138,6 @@ $result_trees{'double_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -169,12 +163,10 @@ 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'co
 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1];
 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'double_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0];
 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'double_copying'}{'contents'}[0]{'contents'}[0];
-$result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 $result_trees{'double_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'double_copying'}{'contents'}[0];
 $result_trees{'double_copying'}{'contents'}[0]{'parent'} = 
$result_trees{'double_copying'};
 
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index cef1d48d94..bdda57f82b 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -86,9 +86,6 @@ $result_trees{'format_in_titlepage'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -132,9 +129,6 @@ $result_trees{'format_in_titlepage'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -215,13 +209,11 @@ 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0];
 $result_trees{'format_in_titlepage'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'format_in_titlepage'}{'contents'}[0];
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index a0426656d9..f7faa2f6a6 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -86,9 +86,6 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -132,9 +129,6 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -215,13 +209,11 @@ 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'format_in_titlepage_titlepage'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'format_in_titlepage_titlepage'}{'contents'}[0];
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index 19736a4d05..686f19021a 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -137,9 +137,6 @@ $result_trees{'ref_in_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -351,9 +348,6 @@ $result_trees{'ref_in_copying'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -433,7 +427,6 @@ 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0];
 $result_trees{'ref_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'ref_in_copying'}{'contents'}[0];
@@ -463,7 +456,6 @@ 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'pa
 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3];
-$result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'ref_in_copying'}{'contents'}[2];
 $result_trees{'ref_in_copying'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'ref_in_copying'}{'contents'}[2];
 $result_trees{'ref_in_copying'}{'contents'}[2]{'parent'} = 
$result_trees{'ref_in_copying'};
@@ -563,8 +555,7 @@ $result_nodes{'ref_in_copying'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 11fa7ead67..448c98a0bc 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
@@ -137,9 +137,6 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -428,9 +425,6 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -510,7 +504,6 @@ 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[0];
@@ -549,7 +542,6 @@ 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3];
-$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4];
 
$result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4];
 $result_trees{'ref_in_copying_insert_in_chapter'}{'contents'}[4]{'parent'} = 
$result_trees{'ref_in_copying_insert_in_chapter'};
@@ -688,8 +680,7 @@ $result_nodes{'ref_in_copying_insert_in_chapter'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'Intro'
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index db93dd577e..ebe060222c 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -83,9 +83,6 @@ $result_trees{'today_in_copying'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -260,7 +257,6 @@ 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'
 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0];
 $result_trees{'today_in_copying'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'today_in_copying'}{'contents'}[0];
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl 
b/tp/t/results/sectioning/anchor_in_footnote.pl
index ae0785723d..94cf341590 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -262,9 +262,6 @@ $result_trees{'anchor_in_footnote'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -447,7 +444,6 @@ 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[0]
 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3];
-$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'anchor_in_footnote'}{'contents'}[2];
 $result_trees{'anchor_in_footnote'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'anchor_in_footnote'}{'contents'}[2];
 $result_trees{'anchor_in_footnote'}{'contents'}[2]{'parent'} = 
$result_trees{'anchor_in_footnote'};
@@ -558,8 +554,7 @@ $result_nodes{'anchor_in_footnote'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index bf2c364e79..13ff90dce9 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -294,9 +294,6 @@ $result_trees{'anchor_in_footnote_separate'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -482,7 +479,6 @@ 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'cont
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3];
-$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'anchor_in_footnote_separate'}{'contents'}[2];
 
$result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'anchor_in_footnote_separate'}{'contents'}[2];
 $result_trees{'anchor_in_footnote_separate'}{'contents'}[2]{'parent'} = 
$result_trees{'anchor_in_footnote_separate'};
@@ -594,8 +590,7 @@ $result_nodes{'anchor_in_footnote_separate'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index b8f4a494ea..9b91f22807 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -196,9 +196,6 @@ $result_trees{'chapter_between_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -444,7 +441,6 @@ 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}
 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1];
 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2];
-$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'contents'}[1];
 $result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'chapter_between_nodes'}{'contents'}[2];
 $result_trees{'chapter_between_nodes'}{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'chapter_between_nodes'}{'contents'}[2];
 $result_trees{'chapter_between_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'chapter_between_nodes'};
@@ -585,8 +581,7 @@ $result_nodes{'chapter_between_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 1ce0ed420a..4280d9c15c 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
@@ -186,9 +186,6 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -371,7 +368,6 @@ 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1
 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1];
-$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'chapter_node_before_and_after_part'}{'contents'}[2];
 
$result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'chapter_node_before_and_after_part'}{'contents'}[2];
 $result_trees{'chapter_node_before_and_after_part'}{'contents'}[2]{'parent'} = 
$result_trees{'chapter_node_before_and_after_part'};
@@ -499,8 +495,7 @@ $result_nodes{'chapter_node_before_and_after_part'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
index 221647acb8..f5a88e4964 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -242,9 +242,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1489,9 +1486,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1568,7 +1562,6 @@ 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'con
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2];
 $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'parent'} = 
$result_trees{'character_and_spaces_in_refs'};
@@ -1753,7 +1746,6 @@ 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'con
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[6];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[6];
 $result_trees{'character_and_spaces_in_refs'}{'contents'}[6]{'parent'} = 
$result_trees{'character_and_spaces_in_refs'};
@@ -1929,8 +1921,7 @@ $result_nodes{'character_and_spaces_in_refs'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1961,8 +1952,7 @@ $result_nodes{'character_and_spaces_in_refs'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'other-nodes'
diff --git a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl 
b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
index 1ae00c36a3..4351e906d1 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs_out.pl
@@ -237,9 +237,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -1484,9 +1481,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -1621,7 +1615,6 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'c
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'};
@@ -1806,7 +1799,6 @@ 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'c
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1];
-$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[3];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6];
 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs_out'}[0]{'contents'}[0]{'parent'};
@@ -2361,8 +2353,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
                           },
                           'menus' => [
                             {
-                              'cmdname' => 'menu',
-                              'extra' => {}
+                              'cmdname' => 'menu'
                             }
                           ],
                           'normalized' => 'other-nodes'
@@ -2413,8 +2404,7 @@ $result_nodes{'character_and_spaces_in_refs_out'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index 984196e3ac..1b0115ef6d 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -493,9 +493,6 @@ $result_trees{'complex'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -866,9 +863,6 @@ $result_trees{'complex'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -1231,9 +1225,6 @@ $result_trees{'complex'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -1733,9 +1724,6 @@ $result_trees{'complex'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -2748,7 +2736,6 @@ 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0];
-$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'} 
= $result_trees{'complex'}[0]{'contents'}[0]{'parent'};
@@ -2806,7 +2793,6 @@ 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2];
-$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4];
 $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'parent'} 
= $result_trees{'complex'}[0]{'contents'}[0]{'parent'};
@@ -2862,7 +2848,6 @@ 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1];
-$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6];
 $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'parent'} 
= $result_trees{'complex'}[0]{'contents'}[0]{'parent'};
@@ -2924,7 +2909,6 @@ 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1];
-$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'parent'}
 = $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16];
 
$result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[2]{'parent'}
 = $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16];
 $result_trees{'complex'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'parent'} 
= $result_trees{'complex'}[0]{'contents'}[0]{'parent'};
@@ -4406,8 +4390,7 @@ $result_nodes{'complex'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -4420,8 +4403,7 @@ $result_nodes{'complex'} = {
         'associated_section' => {},
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'First-node'
@@ -4434,8 +4416,7 @@ $result_nodes{'complex'} = {
             'associated_section' => {},
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'unnumbered'
@@ -4495,8 +4476,7 @@ $result_nodes{'complex'} = {
                 'associated_section' => {},
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'unnumbered2'
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index ea1e155fe3..265bcff196 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -493,9 +493,6 @@ $result_trees{'complex_split_at_node'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -866,9 +863,6 @@ $result_trees{'complex_split_at_node'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -1231,9 +1225,6 @@ $result_trees{'complex_split_at_node'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -1733,9 +1724,6 @@ $result_trees{'complex_split_at_node'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -2764,7 +2752,6 @@ 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'args'}[0];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'contents'}[6];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'};
@@ -2822,7 +2809,6 @@ 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[3]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'parent'}
 = $result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'};
@@ -2878,7 +2864,6 @@ 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'contents'}[4];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[6]{'parent'}
 = $result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'};
@@ -2940,7 +2925,6 @@ 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1];
-$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'contents'}[1];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16];
 
$result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'}{'contents'}[16]{'parent'}
 = $result_trees{'complex_split_at_node'}[0]{'contents'}[0]{'parent'};
@@ -4137,8 +4121,7 @@ $result_nodes{'complex_split_at_node'} = {
                       },
                       'menus' => [
                         {
-                          'cmdname' => 'menu',
-                          'extra' => {}
+                          'cmdname' => 'menu'
                         }
                       ],
                       'normalized' => 'First-node'
@@ -4557,8 +4540,7 @@ $result_nodes{'complex_split_at_node'} = {
                                                             },
                                                             'menus' => [
                                                               {
-                                                                'cmdname' => 
'menu',
-                                                                'extra' => {}
+                                                                'cmdname' => 
'menu'
                                                               }
                                                             ],
                                                             'normalized' => 
'unnumbered2'
@@ -4637,8 +4619,7 @@ $result_nodes{'complex_split_at_node'} = {
                           },
                           'menus' => [
                             {
-                              'cmdname' => 'menu',
-                              'extra' => {}
+                              'cmdname' => 'menu'
                             }
                           ],
                           'normalized' => 'unnumbered'
@@ -4697,8 +4678,7 @@ $result_nodes{'complex_split_at_node'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/contents_at_end_document_after_node.pl 
b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
index 0e9a67d056..99e02b0490 100644
--- a/tp/t/results/sectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
@@ -245,9 +245,6 @@ $result_trees{'contents_at_end_document_after_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'contents_at_end_document_after_node.texi',
@@ -454,7 +451,6 @@ 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[
 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'contents_at_end_document_after_node'}{'contents'}[2];
 
$result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'contents_at_end_document_after_node'}{'contents'}[2];
 $result_trees{'contents_at_end_document_after_node'}{'contents'}[2]{'parent'} 
= $result_trees{'contents_at_end_document_after_node'};
@@ -564,8 +560,7 @@ $result_nodes{'contents_at_end_document_after_node'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 37ea20516c..437e74dd0f 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -265,7 +265,6 @@ $result_trees{'double_node_anchor_float'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -348,7 +347,6 @@ $result_trees{'double_node_anchor_float'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' ',
             'type' => {
               'content' => [
@@ -431,7 +429,6 @@ $result_trees{'double_node_anchor_float'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -549,7 +546,6 @@ 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1];
-$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'double_node_anchor_float'}{'contents'}[3];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'double_node_anchor_float'}{'contents'}[3];
@@ -560,7 +556,6 @@ 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3];
-$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'double_node_anchor_float'}{'contents'}[3];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'parent'}
 = $result_trees{'double_node_anchor_float'}{'contents'}[3];
@@ -571,7 +566,6 @@ 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'args'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5];
-$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'extra'}{'node_content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'parent'}
 = $result_trees{'double_node_anchor_float'}{'contents'}[3];
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index dc8c088394..7c7d3eff41 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -186,9 +186,6 @@ $result_trees{'double_part'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -446,7 +443,6 @@ 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'content
 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'double_part'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'double_part'}[0]{'contents'}[0]{'parent'};
@@ -776,8 +772,7 @@ $result_nodes{'double_part'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index 323651ddc7..4d13bee9e7 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -217,9 +217,6 @@ $result_trees{'double_top_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -384,7 +381,6 @@ 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]
 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2];
-$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[2];
 $result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'double_top_in_menu'}{'contents'}[1];
 $result_trees{'double_top_in_menu'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'double_top_in_menu'}{'contents'}[1];
 $result_trees{'double_top_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'double_top_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -431,8 +427,7 @@ $result_nodes{'double_top_in_menu'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl 
b/tp/t/results/sectioning/empty_top_node_up.pl
index 294c2e54ee..ad9fc1208f 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -179,9 +179,6 @@ $result_trees{'empty_top_node_up'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -273,7 +270,6 @@ 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{
 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1];
-$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'empty_top_node_up'}{'contents'}[2];
 $result_trees{'empty_top_node_up'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'empty_top_node_up'}{'contents'}[2];
 $result_trees{'empty_top_node_up'}{'contents'}[2]{'parent'} = 
$result_trees{'empty_top_node_up'};
@@ -336,8 +332,7 @@ $result_nodes{'empty_top_node_up'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index 9b8806adfa..de24ea4b0e 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -172,7 +172,6 @@ $result_trees{'equivalent_labels'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -374,9 +373,6 @@ $result_trees{'equivalent_labels'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -432,7 +428,6 @@ 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0];
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4];
-$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'extra'}{'node_content'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0];
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
 $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'equivalent_labels'}{'contents'}[1];
@@ -463,7 +458,6 @@ 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0];
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2];
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6];
-$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'contents'}[2];
 $result_trees{'equivalent_labels'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'equivalent_labels'}{'contents'}[1];
 $result_trees{'equivalent_labels'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'equivalent_labels'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'equivalent_labels'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -499,8 +493,7 @@ $result_nodes{'equivalent_labels'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index a919366cf1..f932b8310c 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -185,9 +185,6 @@ $result_trees{'equivalent_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -365,7 +362,6 @@ 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'
 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1];
-$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'equivalent_nodes'}{'contents'}[1];
 $result_trees{'equivalent_nodes'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'equivalent_nodes'}{'contents'}[1];
 $result_trees{'equivalent_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'equivalent_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -412,8 +408,7 @@ $result_nodes{'equivalent_nodes'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index bfcae6fa6d..9e76ff984f 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -201,9 +201,6 @@ $result_trees{'explicit_node_directions'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -495,7 +492,6 @@ 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'
 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1];
-$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'explicit_node_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -567,8 +563,7 @@ $result_nodes{'explicit_node_directions'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index a9c629e328..5a15470c72 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -308,9 +308,6 @@ $result_trees{'external_node_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -532,7 +529,6 @@ 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}
 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1];
-$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 $result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'external_node_in_menu'}{'contents'}[2];
 $result_trees{'external_node_in_menu'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'external_node_in_menu'}{'contents'}[2];
 $result_trees{'external_node_in_menu'}{'contents'}[2]{'parent'} = 
$result_trees{'external_node_in_menu'};
@@ -668,8 +664,7 @@ $result_nodes{'external_node_in_menu'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 ca57c820a4..f7d8ec25d7 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
@@ -448,9 +448,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               }
             }
           ],
-          "extra" => {
-            "end_command" => {}
-          },
           "parent" => {},
           "source_info" => {
             "file_name" => "in_menu_only_special_spaces_node.texi",
@@ -985,7 +982,6 @@ 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[6]{"args"}[0]{"contents"}[0]{"parent"}
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[6]{"args"}[0];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[6]{"args"}[0]{"parent"}
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[6];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[6]{"parent"}
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1];
-$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"extra"}{"end_command"}
 = 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"contents"}[6];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[1]{"parent"}
 = $result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[2]{"parent"}
 = $result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2];
 
$result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2]{"contents"}[3]{"parent"}
 = $result_trees{'in_menu_only_special_spaces_node'}{"contents"}[2];
@@ -1284,8 +1280,7 @@ $result_nodes{'in_menu_only_special_spaces_node'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index c11bd109a4..9e6d045cb8 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -180,9 +180,6 @@ $result_trees{'internal_top_node_up'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -294,7 +291,6 @@ 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]
 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'internal_top_node_up'}[0]{'contents'}[0]{'parent'};
@@ -459,8 +455,7 @@ $result_nodes{'internal_top_node_up'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index e29fa7e28b..62bf635ea5 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -181,9 +181,6 @@ $result_trees{'lone_Top_node'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -328,7 +325,6 @@ 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'conte
 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1];
-$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'lone_Top_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -419,8 +415,7 @@ $result_nodes{'lone_Top_node'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 431ebe7069..c0dc6b0aac 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -221,9 +221,6 @@ $result_trees{'loop_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -394,9 +391,6 @@ $result_trees{'loop_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -587,9 +581,6 @@ $result_trees{'loop_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -706,7 +697,6 @@ 
$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent
 
$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'loop_nodes'}{'contents'}[2];
 $result_trees{'loop_nodes'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'loop_nodes'}{'contents'}[2];
 $result_trees{'loop_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'loop_nodes'};
@@ -731,7 +721,6 @@ 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent
 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1];
-$result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
 $result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'loop_nodes'}{'contents'}[3];
 $result_trees{'loop_nodes'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'loop_nodes'}{'contents'}[3];
 $result_trees{'loop_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'loop_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -759,7 +748,6 @@ 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent
 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'loop_nodes'}{'contents'}[4];
 $result_trees{'loop_nodes'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'loop_nodes'}{'contents'}[4];
 $result_trees{'loop_nodes'}{'contents'}[4]{'extra'}{'node_content'}[0] = 
$result_trees{'loop_nodes'}{'contents'}[4]{'args'}[0]{'contents'}[0];
@@ -846,8 +834,7 @@ $result_nodes{'loop_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -858,8 +845,7 @@ $result_nodes{'loop_nodes'} = {
       'extra' => {
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'node-up'
@@ -870,8 +856,7 @@ $result_nodes{'loop_nodes'} = {
           'extra' => {
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'node-middle'
diff --git a/tp/t/results/sectioning/lowered_subsubsection.pl 
b/tp/t/results/sectioning/lowered_subsubsection.pl
index 53d01044d9..e5f77b2b5e 100644
--- a/tp/t/results/sectioning/lowered_subsubsection.pl
+++ b/tp/t/results/sectioning/lowered_subsubsection.pl
@@ -174,9 +174,6 @@ $result_trees{'lowered_subsubsection'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -366,9 +363,6 @@ $result_trees{'lowered_subsubsection'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -560,9 +554,6 @@ $result_trees{'lowered_subsubsection'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -811,9 +802,6 @@ $result_trees{'lowered_subsubsection'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1094,9 +1082,6 @@ $result_trees{'lowered_subsubsection'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1266,7 +1251,6 @@ 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}
 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1];
-$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[2];
 $result_trees{'lowered_subsubsection'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[2];
 $result_trees{'lowered_subsubsection'}{'contents'}[2]{'parent'} = 
$result_trees{'lowered_subsubsection'};
@@ -1292,7 +1276,6 @@ 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}
 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1];
-$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[4];
 $result_trees{'lowered_subsubsection'}{'contents'}[4]{'contents'}[2]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[4];
 $result_trees{'lowered_subsubsection'}{'contents'}[4]{'parent'} = 
$result_trees{'lowered_subsubsection'};
@@ -1318,7 +1301,6 @@ 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}
 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1];
-$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 $result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[1]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[6];
 $result_trees{'lowered_subsubsection'}{'contents'}[6]{'contents'}[2]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[6];
 $result_trees{'lowered_subsubsection'}{'contents'}[6]{'parent'} = 
$result_trees{'lowered_subsubsection'};
@@ -1354,7 +1336,6 @@ 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}
 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1];
-$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'contents'}[2];
 $result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[1]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[8];
 $result_trees{'lowered_subsubsection'}{'contents'}[8]{'contents'}[2]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[8];
 $result_trees{'lowered_subsubsection'}{'contents'}[8]{'parent'} = 
$result_trees{'lowered_subsubsection'};
@@ -1391,7 +1372,6 @@ 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'
 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[1];
 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1];
-$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'contents'}[1];
 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[1]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[12];
 
$result_trees{'lowered_subsubsection'}{'contents'}[12]{'contents'}[2]{'parent'} 
= $result_trees{'lowered_subsubsection'}{'contents'}[12];
 $result_trees{'lowered_subsubsection'}{'contents'}[12]{'parent'} = 
$result_trees{'lowered_subsubsection'};
@@ -1653,8 +1633,7 @@ $result_nodes{'lowered_subsubsection'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1672,8 +1651,7 @@ $result_nodes{'lowered_subsubsection'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'Chapter'
@@ -1691,8 +1669,7 @@ $result_nodes{'lowered_subsubsection'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'Section'
@@ -1710,8 +1687,7 @@ $result_nodes{'lowered_subsubsection'} = {
                 },
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'Subsection'
@@ -1744,8 +1720,7 @@ $result_nodes{'lowered_subsubsection'} = {
                         },
                         'menus' => [
                           {
-                            'cmdname' => 'menu',
-                            'extra' => {}
+                            'cmdname' => 'menu'
                           }
                         ],
                         'normalized' => 'Lowered-subsec'
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 9d6ca63bd5..80786a2edd 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -167,9 +167,6 @@ $result_trees{'menutextorder'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -354,9 +351,6 @@ $result_trees{'menutextorder'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -822,9 +816,6 @@ $result_trees{'menutextorder'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1100,7 +1091,6 @@ 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'par
 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0];
-$result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'menutextorder'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'menutextorder'}{'contents'}[0];
 $result_trees{'menutextorder'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'menutextorder'}{'contents'}[0];
 $result_trees{'menutextorder'}{'contents'}[0]{'parent'} = 
$result_trees{'menutextorder'};
@@ -1126,7 +1116,6 @@ 
$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'par
 
$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1];
-$result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'menutextorder'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'menutextorder'}{'contents'}[2];
 $result_trees{'menutextorder'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'menutextorder'}{'contents'}[2];
 $result_trees{'menutextorder'}{'contents'}[2]{'parent'} = 
$result_trees{'menutextorder'};
@@ -1191,7 +1180,6 @@ 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[2]{'par
 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[3];
 
$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1];
-$result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'contents'}[3];
 $result_trees{'menutextorder'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'menutextorder'}{'contents'}[8];
 $result_trees{'menutextorder'}{'contents'}[8]{'contents'}[2]{'parent'} = 
$result_trees{'menutextorder'}{'contents'}[8];
 $result_trees{'menutextorder'}{'contents'}[8]{'parent'} = 
$result_trees{'menutextorder'};
@@ -1453,8 +1441,7 @@ $result_nodes{'menutextorder'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'bar'
@@ -1505,8 +1492,7 @@ $result_nodes{'menutextorder'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'foo'
diff --git a/tp/t/results/sectioning/more_sections_than_nodes.pl 
b/tp/t/results/sectioning/more_sections_than_nodes.pl
index 750ea95778..ec11100e8c 100644
--- a/tp/t/results/sectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/sectioning/more_sections_than_nodes.pl
@@ -293,9 +293,6 @@ $result_trees{'more_sections_than_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -691,9 +688,6 @@ $result_trees{'more_sections_than_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1165,7 +1159,6 @@ 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'content
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[2];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[2];
 $result_trees{'more_sections_than_nodes'}{'contents'}[2]{'parent'} = 
$result_trees{'more_sections_than_nodes'};
@@ -1217,7 +1210,6 @@ 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'content
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1];
-$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[8];
 
$result_trees{'more_sections_than_nodes'}{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'more_sections_than_nodes'}{'contents'}[8];
 $result_trees{'more_sections_than_nodes'}{'contents'}[8]{'parent'} = 
$result_trees{'more_sections_than_nodes'};
@@ -1590,8 +1582,7 @@ $result_nodes{'more_sections_than_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1622,8 +1613,7 @@ $result_nodes{'more_sections_than_nodes'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'n-c3'
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 3568ba5e06..33b76203f1 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -179,9 +179,6 @@ $result_trees{'next_in_menu_is_below'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -430,9 +427,6 @@ $result_trees{'next_in_menu_is_below'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -624,9 +618,6 @@ $result_trees{'next_in_menu_is_below'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -747,7 +738,6 @@ 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}
 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1];
-$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'next_in_menu_is_below'}{'contents'}[2];
 $result_trees{'next_in_menu_is_below'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'next_in_menu_is_below'}{'contents'}[2];
 $result_trees{'next_in_menu_is_below'}{'contents'}[2]{'parent'} = 
$result_trees{'next_in_menu_is_below'};
@@ -783,7 +773,6 @@ 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}
 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1];
-$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 $result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[1]{'parent'} 
= $result_trees{'next_in_menu_is_below'}{'contents'}[4];
 $result_trees{'next_in_menu_is_below'}{'contents'}[4]{'contents'}[2]{'parent'} 
= $result_trees{'next_in_menu_is_below'}{'contents'}[4];
 $result_trees{'next_in_menu_is_below'}{'contents'}[4]{'parent'} = 
$result_trees{'next_in_menu_is_below'};
@@ -809,7 +798,6 @@ 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}
 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1];
-$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 $result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[1]{'parent'} 
= $result_trees{'next_in_menu_is_below'}{'contents'}[6];
 $result_trees{'next_in_menu_is_below'}{'contents'}[6]{'contents'}[2]{'parent'} 
= $result_trees{'next_in_menu_is_below'}{'contents'}[6];
 $result_trees{'next_in_menu_is_below'}{'contents'}[6]{'parent'} = 
$result_trees{'next_in_menu_is_below'};
@@ -968,8 +956,7 @@ $result_nodes{'next_in_menu_is_below'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -987,8 +974,7 @@ $result_nodes{'next_in_menu_is_below'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -1006,8 +992,7 @@ $result_nodes{'next_in_menu_is_below'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'section'
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 979acb519c..e1ae09c409 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -195,9 +195,6 @@ $result_trees{'next_no_prev_to_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -425,7 +422,6 @@ 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[
 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1];
-$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 $result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'next_no_prev_to_node'}{'contents'}[1];
 $result_trees{'next_no_prev_to_node'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'next_no_prev_to_node'}{'contents'}[1];
 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'next_no_prev_to_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -480,8 +476,7 @@ $result_nodes{'next_no_prev_to_node'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/no_element.pl 
b/tp/t/results/sectioning/no_element.pl
index 11368bbf8e..cec920d230 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -432,7 +432,6 @@ $result_trees{'no_element'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -609,9 +608,6 @@ $result_trees{'no_element'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -734,7 +730,6 @@ 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'paren
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[13];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'extra'}{'end_command'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'extra'}{'node_content'}[0]
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'args'}[1]{'contents'}[0];
 $result_trees{'no_element'}{'contents'}[0]{'contents'}[13]{'parent'} = 
$result_trees{'no_element'}{'contents'}[0];
 $result_trees{'no_element'}{'contents'}[0]{'contents'}[14]{'parent'} = 
$result_trees{'no_element'}{'contents'}[0];
@@ -761,7 +756,6 @@ 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'paren
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[1];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[1]{'parent'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[17];
-$result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'extra'}{'end_command'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'contents'}[1];
 $result_trees{'no_element'}{'contents'}[0]{'contents'}[17]{'parent'} = 
$result_trees{'no_element'}{'contents'}[0];
 $result_trees{'no_element'}{'contents'}[0]{'contents'}[18]{'parent'} = 
$result_trees{'no_element'}{'contents'}[0];
 
$result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_element'}{'contents'}[0]{'contents'}[19]{'args'}[0];
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index bed0d08156..ccda285552 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -396,9 +396,6 @@ $result_trees{'node_nested_parentheses'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -499,7 +496,6 @@ 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1];
-$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'node_nested_parentheses'}{'contents'}[1];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'node_nested_parentheses'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -528,8 +524,7 @@ $result_nodes{'node_nested_parentheses'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 e3ac201130..e61059ae7f 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -237,9 +237,6 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -547,7 +544,6 @@ 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'co
 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'node_part_chapter_after_chapter'}[0]{'contents'}[0]{'parent'};
@@ -902,8 +898,7 @@ $result_nodes{'node_part_chapter_after_chapter'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 94e16fe6a3..9fe81f7ffd 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -180,9 +180,6 @@ $result_trees{'node_part_chapter_after_top'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -362,7 +359,6 @@ 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'conten
 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'node_part_chapter_after_top'}[0]{'contents'}[0]{'parent'};
@@ -595,8 +591,7 @@ $result_nodes{'node_part_chapter_after_top'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index 42f4187cff..e29ce04a66 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -138,9 +138,6 @@ $result_trees{'node_referenced_in_ref'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -335,7 +332,6 @@ 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1];
-$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'node_referenced_in_ref'}{'contents'}[1];
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[2]{'parent'} 
= $result_trees{'node_referenced_in_ref'}{'contents'}[1];
 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_referenced_in_ref'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -388,8 +384,7 @@ $result_nodes{'node_referenced_in_ref'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index 9f7c82a936..3965fe0326 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -145,9 +145,6 @@ $result_trees{'node_up_external_node'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -343,7 +340,6 @@ 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1
 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1];
-$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'node_up_external_node'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -394,8 +390,7 @@ $result_nodes{'node_up_external_node'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index 93cb8857fb..56e94a43b2 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -308,9 +308,6 @@ $result_trees{'nodename_parentheses'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -839,7 +836,6 @@ 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1];
-$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 $result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'nodename_parentheses'}{'contents'}[2];
 $result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'nodename_parentheses'}{'contents'}[2];
 $result_trees{'nodename_parentheses'}{'contents'}[2]{'parent'} = 
$result_trees{'nodename_parentheses'};
@@ -1078,8 +1074,7 @@ $result_nodes{'nodename_parentheses'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 dc5a73d104..7dd4202cbf 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
@@ -201,9 +201,6 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -525,7 +522,6 @@ 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -720,8 +716,7 @@ $result_nodes{'nodes_after_top_before_chapter_nodes'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 44ba8c0b8d..2e6b7846ca 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
@@ -206,9 +206,6 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -502,7 +499,6 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'conten
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -600,8 +596,7 @@ $result_nodes{'nodes_after_top_before_chapter_not_split'} = 
{
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 d3dbc33fce..6dee664175 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
@@ -206,9 +206,6 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -502,7 +499,6 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -600,8 +596,7 @@ 
$result_nodes{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 926886cdfd..d446105b85 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
@@ -201,9 +201,6 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -509,7 +506,6 @@ 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'pare
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_chapter_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -632,8 +628,7 @@ $result_nodes{'nodes_after_top_before_chapter_sections'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 7a2761f941..ba7325d31e 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
@@ -201,9 +201,6 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -525,7 +522,6 @@ 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -721,8 +717,7 @@ $result_nodes{'nodes_after_top_before_section_nodes'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 d88a644991..33bc98864e 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
@@ -201,9 +201,6 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -509,7 +506,6 @@ 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'pare
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_after_top_before_section_sections'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -633,8 +629,7 @@ $result_nodes{'nodes_after_top_before_section_sections'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index 0aea99255b..df6ccfa2f9 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -219,9 +219,6 @@ $result_trees{'nodes_before_top'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -535,9 +532,6 @@ $result_trees{'nodes_before_top'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -665,7 +659,6 @@ 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'nodes_before_top'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -710,7 +703,6 @@ 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1];
-$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[4];
 $result_trees{'nodes_before_top'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'nodes_before_top'}{'contents'}[4];
 $result_trees{'nodes_before_top'}{'contents'}[4]{'parent'} = 
$result_trees{'nodes_before_top'};
@@ -818,8 +810,7 @@ $result_nodes{'nodes_before_top'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -846,8 +837,7 @@ $result_nodes{'nodes_before_top'} = {
       'extra' => {
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'first'
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 f9eb225be7..226e57abf1 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
@@ -178,9 +178,6 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -363,7 +360,6 @@ 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2];
-$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'nodes_no_node_top_explicit_directions'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -413,8 +409,7 @@ $result_nodes{'nodes_no_node_top_explicit_directions'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'first'
diff --git a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl 
b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
index e7eabdbc70..89bb97916a 100644
--- a/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
+++ b/tp/t/results/sectioning/non_automatic_internal_top_node_up.pl
@@ -351,9 +351,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -595,7 +592,6 @@ 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = 
$result_trees{'non_automatic_internal_top_node_up'}[0]{'contents'}[0]{'parent'};
@@ -772,8 +768,7 @@ $result_nodes{'non_automatic_internal_top_node_up'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
index da78befb9b..35310ff57d 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_and_url.pl
@@ -351,9 +351,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -595,7 +592,6 @@ 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_and_url'}[0]{'contents'}[0]{'parent'};
@@ -772,8 +768,7 @@ $result_nodes{'non_automatic_top_node_up_and_url'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl 
b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
index 511d101e8a..ff729eb654 100644
--- a/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
+++ b/tp/t/results/sectioning/non_automatic_top_node_up_url.pl
@@ -249,9 +249,6 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -428,7 +425,6 @@ 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'cont
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'non_automatic_top_node_up_url'}[0]{'contents'}[0]{'parent'};
@@ -646,8 +642,7 @@ $result_nodes{'non_automatic_top_node_up_url'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index 0c0d61fac8..f6da717659 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -179,9 +179,6 @@ $result_trees{'novalidate'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -292,7 +289,6 @@ 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent
 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'novalidate'}{'contents'}[1]{'contents'}[1];
-$result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'novalidate'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'novalidate'}{'contents'}[1];
 $result_trees{'novalidate'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'novalidate'}{'contents'}[1];
 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'novalidate'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'args'}[0];
@@ -332,8 +328,7 @@ $result_nodes{'novalidate'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'first'
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 3ba4cbdcd4..c4a1baaf9b 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -180,9 +180,6 @@ $result_trees{'part_chapter_after_top'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -362,7 +359,6 @@ 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[
 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'part_chapter_after_top'}[0]{'contents'}[0]{'parent'};
@@ -597,8 +593,7 @@ $result_nodes{'part_chapter_after_top'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index 026f4272a4..d2994b276b 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -180,9 +180,6 @@ $result_trees{'part_node_after_top'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -324,7 +321,6 @@ 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{
 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'part_node_after_top'}[0]{'contents'}[0]{'parent'};
@@ -500,8 +496,7 @@ $result_nodes{'part_node_after_top'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index fbdef4a112..2f90f0b477 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -298,9 +298,6 @@ $result_trees{'part_node_before_top'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -375,7 +372,6 @@ 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]
 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1];
-$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'extra'}{'associated_part'}
 = 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'}{'contents'}[4]{'parent'}
 = $result_trees{'part_node_before_top'}[0]{'contents'}[0]{'parent'};
@@ -506,8 +502,7 @@ $result_nodes{'part_node_before_top'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'node_preceding_part' => {},
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 007e5ccf8a..c070e7c695 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -237,9 +237,6 @@ $result_trees{'part_node_chapter_after_top'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -586,7 +583,6 @@ 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'conten
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_after_top'}[0]{'contents'}[0]{'parent'};
@@ -856,8 +852,7 @@ $result_nodes{'part_node_chapter_after_top'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 214d8c8e42..6f8ca86f36 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -180,9 +180,6 @@ $result_trees{'part_node_chapter_appendix'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -407,7 +404,6 @@ 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'content
 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_appendix'}[0]{'contents'}[0]{'parent'};
@@ -720,8 +716,7 @@ $result_nodes{'part_node_chapter_appendix'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 efae654138..0f74c3ea96 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -237,9 +237,6 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -516,7 +513,6 @@ 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'co
 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'part_node_chapter_node_appendix'}[0]{'contents'}[0]{'parent'};
@@ -864,8 +860,7 @@ $result_nodes{'part_node_chapter_node_appendix'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 73babdffbf..112577ec02 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -237,9 +237,6 @@ $result_trees{'part_node_node_part_appendix'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -554,7 +551,6 @@ 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'conte
 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'part_node_node_part_appendix'}[0]{'contents'}[0]{'parent'};
@@ -936,8 +932,7 @@ $result_nodes{'part_node_node_part_appendix'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index a83005f18b..f22ffdb3e4 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -180,9 +180,6 @@ $result_trees{'part_node_part_appendix'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -445,7 +442,6 @@ 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}
 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'part_node_part_appendix'}[0]{'contents'}[0]{'parent'};
@@ -793,8 +789,7 @@ $result_nodes{'part_node_part_appendix'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 9e731950a8..a253642fd4 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -237,9 +237,6 @@ $result_trees{'part_node_part_node_appendix'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -554,7 +551,6 @@ 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'conte
 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'part_node_part_node_appendix'}[0]{'contents'}[0]{'parent'};
@@ -938,8 +934,7 @@ $result_nodes{'part_node_part_node_appendix'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index 264335efff..ef7519b6b9 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -361,7 +361,6 @@ $result_trees{'placed_things_before_element'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -538,9 +537,6 @@ $result_trees{'placed_things_before_element'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -797,7 +793,6 @@ 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'con
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
@@ -824,7 +819,6 @@ 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'co
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13];
-$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'placed_things_before_element'}{'contents'}[0];
 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_element'}{'contents'}[0]{'contents'}[15]{'args'}[0];
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index d8636f1e6b..9136cc799d 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -361,7 +361,6 @@ $result_trees{'placed_things_before_node'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -538,9 +537,6 @@ $result_trees{'placed_things_before_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -838,7 +834,6 @@ 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'conten
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'contents'}[1];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'extra'}{'node_content'}[0]
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0];
@@ -865,7 +860,6 @@ 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'conte
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'contents'}[1]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13];
-$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'contents'}[1];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'placed_things_before_node'}{'contents'}[0];
 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'placed_things_before_node'}{'contents'}[0]{'contents'}[15]{'args'}[0];
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index b986dac371..d7bc19d2a7 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -209,9 +209,6 @@ $result_trees{'protected_node_parentheses'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -467,7 +464,6 @@ 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'conte
 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1];
-$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'protected_node_parentheses'}{'contents'}[2];
 
$result_trees{'protected_node_parentheses'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'protected_node_parentheses'}{'contents'}[2];
 $result_trees{'protected_node_parentheses'}{'contents'}[2]{'parent'} = 
$result_trees{'protected_node_parentheses'};
@@ -566,8 +562,7 @@ $result_nodes{'protected_node_parentheses'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/raiselowersections.pl 
b/tp/t/results/sectioning/raiselowersections.pl
index 261c84afef..12a4edf366 100644
--- a/tp/t/results/sectioning/raiselowersections.pl
+++ b/tp/t/results/sectioning/raiselowersections.pl
@@ -260,9 +260,6 @@ $result_trees{'raiselowersections'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -452,9 +449,6 @@ $result_trees{'raiselowersections'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -734,9 +728,6 @@ $result_trees{'raiselowersections'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'section_file.texi',
@@ -929,9 +920,6 @@ $result_trees{'raiselowersections'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'section_file.texi',
@@ -1245,7 +1233,6 @@ 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0];
-$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2];
 $result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[2];
 $result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[2];
 $result_trees{'raiselowersections'}{'contents'}[2]{'parent'} = 
$result_trees{'raiselowersections'};
@@ -1271,7 +1258,6 @@ 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[0]
 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1];
-$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[4];
 $result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[4];
 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[3];
@@ -1310,7 +1296,6 @@ 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[0]
 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1];
-$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 $result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[6];
 $result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[6];
 $result_trees{'raiselowersections'}{'contents'}[6]{'parent'} = 
$result_trees{'raiselowersections'};
@@ -1336,7 +1321,6 @@ 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[0]
 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1];
-$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 $result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[8];
 $result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[2]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[8];
 $result_trees{'raiselowersections'}{'contents'}[8]{'parent'} = 
$result_trees{'raiselowersections'};
@@ -1610,8 +1594,7 @@ $result_nodes{'raiselowersections'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1629,8 +1612,7 @@ $result_nodes{'raiselowersections'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'Chapter'
@@ -1650,8 +1632,7 @@ $result_nodes{'raiselowersections'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'Chapter-in-included-file'
@@ -1671,8 +1652,7 @@ $result_nodes{'raiselowersections'} = {
                 },
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'Section'
diff --git a/tp/t/results/sectioning/rec_nodes.pl 
b/tp/t/results/sectioning/rec_nodes.pl
index 948c15c406..0ac519cc75 100644
--- a/tp/t/results/sectioning/rec_nodes.pl
+++ b/tp/t/results/sectioning/rec_nodes.pl
@@ -206,9 +206,6 @@ $result_trees{'rec_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -453,9 +450,6 @@ $result_trees{'rec_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -651,9 +645,6 @@ $result_trees{'rec_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -838,9 +829,6 @@ $result_trees{'rec_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1059,9 +1047,6 @@ $result_trees{'rec_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1133,7 +1118,6 @@ 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'
 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2];
 
$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2];
-$result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'contents'}[2];
 $result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'rec_nodes'}{'contents'}[1];
 $result_trees{'rec_nodes'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'rec_nodes'}{'contents'}[1];
 $result_trees{'rec_nodes'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'rec_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -1171,7 +1155,6 @@ 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'
 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1];
-$result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 $result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'rec_nodes'}{'contents'}[2];
 $result_trees{'rec_nodes'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'rec_nodes'}{'contents'}[2];
 $result_trees{'rec_nodes'}{'contents'}[2]{'extra'}{'node_content'}[0] = 
$result_trees{'rec_nodes'}{'contents'}[2]{'args'}[0]{'contents'}[0];
@@ -1200,7 +1183,6 @@ 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'
 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
 
$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1];
-$result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
 $result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'rec_nodes'}{'contents'}[3];
 $result_trees{'rec_nodes'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'rec_nodes'}{'contents'}[3];
 $result_trees{'rec_nodes'}{'contents'}[3]{'extra'}{'node_content'}[0] = 
$result_trees{'rec_nodes'}{'contents'}[3]{'args'}[0]{'contents'}[0];
@@ -1227,7 +1209,6 @@ 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'
 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0];
-$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'contents'}[1];
 $result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'rec_nodes'}{'contents'}[4];
 $result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'rec_nodes'}{'contents'}[4];
 
$result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[4]{'contents'}[2];
@@ -1260,7 +1241,6 @@ 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[0]{'parent'
 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[1];
 
$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2];
-$result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'extra'}{'end_command'}
 = $result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'contents'}[1];
 $result_trees{'rec_nodes'}{'contents'}[5]{'contents'}[2]{'parent'} = 
$result_trees{'rec_nodes'}{'contents'}[5];
 $result_trees{'rec_nodes'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'rec_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
 
$result_trees{'rec_nodes'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = $result_trees{'rec_nodes'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -1330,8 +1310,7 @@ $result_nodes{'rec_nodes'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -1342,8 +1321,7 @@ $result_nodes{'rec_nodes'} = {
       'extra' => {
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'second-node'
@@ -1354,8 +1332,7 @@ $result_nodes{'rec_nodes'} = {
           'extra' => {
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'other-node'
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index 497f780918..d1153548a3 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -284,9 +284,6 @@ $result_trees{'section_before_top'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -345,7 +342,6 @@ 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[0]
 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1];
-$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'section_before_top'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'section_before_top'}{'contents'}[4];
 $result_trees{'section_before_top'}{'contents'}[4]{'parent'} = 
$result_trees{'section_before_top'};
 
@@ -427,8 +423,7 @@ $result_nodes{'section_before_top'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index 6420936331..c33787c665 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -238,9 +238,6 @@ $result_trees{'section_below_unnumbered'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -438,9 +435,6 @@ $result_trees{'section_below_unnumbered'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -606,7 +600,6 @@ 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'content
 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3];
-$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'section_below_unnumbered'}{'contents'}[2];
 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'section_below_unnumbered'}{'contents'}[2];
 
$result_trees{'section_below_unnumbered'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'section_below_unnumbered'}{'contents'}[2];
@@ -633,7 +626,6 @@ 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'content
 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1];
-$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'section_below_unnumbered'}{'contents'}[4];
 
$result_trees{'section_below_unnumbered'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'section_below_unnumbered'}{'contents'}[4];
 $result_trees{'section_below_unnumbered'}{'contents'}[4]{'parent'} = 
$result_trees{'section_below_unnumbered'};
@@ -779,8 +771,7 @@ $result_nodes{'section_below_unnumbered'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -796,8 +787,7 @@ $result_nodes{'section_below_unnumbered'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'Unn'
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 e1f68754fd..f43c61bc60 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -262,9 +262,6 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -456,9 +453,6 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -519,7 +513,6 @@ 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1];
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'section_chapter_before_top_nodes'}{'contents'}[4];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'section_chapter_before_top_nodes'}{'contents'}[4];
 $result_trees{'section_chapter_before_top_nodes'}{'contents'}[4]{'parent'} = 
$result_trees{'section_chapter_before_top_nodes'};
@@ -545,7 +538,6 @@ 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1];
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'section_chapter_before_top_nodes'}{'contents'}[6];
 
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'parent'}
 = $result_trees{'section_chapter_before_top_nodes'}{'contents'}[6];
 $result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'parent'} = 
$result_trees{'section_chapter_before_top_nodes'};
@@ -664,8 +656,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -683,8 +674,7 @@ $result_nodes{'section_chapter_before_top_nodes'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter-node'
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl 
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index 153ee134d3..e32acd7bbf 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -454,9 +454,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -648,9 +645,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -919,9 +913,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1247,9 +1238,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1612,9 +1600,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2114,9 +2099,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2619,9 +2601,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2984,9 +2963,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -3563,9 +3539,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -3834,9 +3807,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -4105,9 +4075,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -4376,9 +4343,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -4741,9 +4705,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -5142,7 +5103,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'conte
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[5];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'contents'}[5];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[2];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[2];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[2]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5168,7 +5128,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'conte
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[4];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[4];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[4]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5203,7 +5162,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'conte
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[8];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[8];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[8]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5248,7 +5206,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[2];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'contents'}[2];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[12];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[12];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[12]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5304,7 +5261,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[14];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[14];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[14]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5366,7 +5322,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[24];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[24];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[24]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5442,7 +5397,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[5];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'contents'}[5];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[28];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[28];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[28]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5498,7 +5452,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[30];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[30];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[30]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5569,7 +5522,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[42];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[42];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[42]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5604,7 +5556,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[46];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[46];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[46]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5639,7 +5590,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[50];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[50];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[50]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5674,7 +5624,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[54];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[54];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[54]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -5730,7 +5679,6 @@ 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'cont
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1];
-$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[56];
 
$result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_info'}{'contents'}[56];
 $result_trees{'section_in_unnumbered_info'}{'contents'}[56]{'parent'} = 
$result_trees{'section_in_unnumbered_info'};
@@ -6741,8 +6689,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -6760,8 +6707,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -6793,8 +6739,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'unnumbered'
@@ -6826,8 +6771,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                 },
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'chapter-2'
@@ -6843,8 +6787,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                     },
                     'menus' => [
                       {
-                        'cmdname' => 'menu',
-                        'extra' => {}
+                        'cmdname' => 'menu'
                       }
                     ],
                     'normalized' => 'unnumberedsec-2'
@@ -6919,8 +6862,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         },
                         'menus' => [
                           {
-                            'cmdname' => 'menu',
-                            'extra' => {}
+                            'cmdname' => 'menu'
                           }
                         ],
                         'normalized' => 'unnumberedsec-2_002d1'
@@ -6959,8 +6901,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                     },
                     'menus' => [
                       {
-                        'cmdname' => 'menu',
-                        'extra' => {}
+                        'cmdname' => 'menu'
                       }
                     ],
                     'normalized' => 'chapter-3'
@@ -6976,8 +6917,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         },
                         'menus' => [
                           {
-                            'cmdname' => 'menu',
-                            'extra' => {}
+                            'cmdname' => 'menu'
                           }
                         ],
                         'normalized' => 'unnumberedsec-3'
@@ -7065,8 +7005,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                 },
                                 'menus' => [
                                   {
-                                    'cmdname' => 'menu',
-                                    'extra' => {}
+                                    'cmdname' => 'menu'
                                   }
                                 ],
                                 'normalized' => 'unnumberedsec-3_002d2'
@@ -7098,8 +7037,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                     },
                                     'menus' => [
                                       {
-                                        'cmdname' => 'menu',
-                                        'extra' => {}
+                                        'cmdname' => 'menu'
                                       }
                                     ],
                                     'normalized' => 'section-3_002d3'
@@ -7131,8 +7069,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                                         },
                                         'menus' => [
                                           {
-                                            'cmdname' => 'menu',
-                                            'extra' => {}
+                                            'cmdname' => 'menu'
                                           }
                                         ],
                                         'normalized' => 'unnumberedsec-3_002d4'
@@ -7181,8 +7118,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                         },
                         'menus' => [
                           {
-                            'cmdname' => 'menu',
-                            'extra' => {}
+                            'cmdname' => 'menu'
                           }
                         ],
                         'normalized' => 'unnumbered-4'
@@ -7198,8 +7134,7 @@ $result_nodes{'section_in_unnumbered_info'} = {
                             },
                             'menus' => [
                               {
-                                'cmdname' => 'menu',
-                                'extra' => {}
+                                'cmdname' => 'menu'
                               }
                             ],
                             'normalized' => 'unnumberedsec-4'
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index 696727a521..08a7f83d9e 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -465,9 +465,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -659,9 +656,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -930,9 +924,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1258,9 +1249,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1623,9 +1611,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2125,9 +2110,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2630,9 +2612,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2995,9 +2974,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -3574,9 +3550,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -3845,9 +3818,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -4116,9 +4086,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -4387,9 +4354,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -4752,9 +4716,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -5155,7 +5116,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[5];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[5]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'contents'}[5];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[2]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5181,7 +5141,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[4]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5216,7 +5175,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[8]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5261,7 +5219,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[2];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'contents'}[2];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[12]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5317,7 +5274,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[14]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5379,7 +5335,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[24]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5455,7 +5410,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[5];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[5]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'contents'}[5];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[28]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5511,7 +5465,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[30]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5582,7 +5535,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[42]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5617,7 +5569,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[46]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5652,7 +5603,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[50]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5687,7 +5637,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'contents'}[1];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[54]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -5743,7 +5692,6 @@ 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'args'}[0];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[4]{'parent'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1];
-$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'contents'}[4];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[1]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56];
 
$result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'contents'}[2]{'parent'}
 = $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56];
 $result_trees{'section_in_unnumbered_plaintext'}{'contents'}[56]{'parent'} = 
$result_trees{'section_in_unnumbered_plaintext'};
@@ -6753,8 +6701,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -6772,8 +6719,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'chapter'
@@ -6805,8 +6751,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'unnumbered'
@@ -6838,8 +6783,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                 },
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'chapter-2'
@@ -6855,8 +6799,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                     },
                     'menus' => [
                       {
-                        'cmdname' => 'menu',
-                        'extra' => {}
+                        'cmdname' => 'menu'
                       }
                     ],
                     'normalized' => 'unnumberedsec-2'
@@ -6931,8 +6874,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         },
                         'menus' => [
                           {
-                            'cmdname' => 'menu',
-                            'extra' => {}
+                            'cmdname' => 'menu'
                           }
                         ],
                         'normalized' => 'unnumberedsec-2_002d1'
@@ -6971,8 +6913,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                     },
                     'menus' => [
                       {
-                        'cmdname' => 'menu',
-                        'extra' => {}
+                        'cmdname' => 'menu'
                       }
                     ],
                     'normalized' => 'chapter-3'
@@ -6988,8 +6929,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         },
                         'menus' => [
                           {
-                            'cmdname' => 'menu',
-                            'extra' => {}
+                            'cmdname' => 'menu'
                           }
                         ],
                         'normalized' => 'unnumberedsec-3'
@@ -7077,8 +7017,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                 },
                                 'menus' => [
                                   {
-                                    'cmdname' => 'menu',
-                                    'extra' => {}
+                                    'cmdname' => 'menu'
                                   }
                                 ],
                                 'normalized' => 'unnumberedsec-3_002d2'
@@ -7110,8 +7049,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                     },
                                     'menus' => [
                                       {
-                                        'cmdname' => 'menu',
-                                        'extra' => {}
+                                        'cmdname' => 'menu'
                                       }
                                     ],
                                     'normalized' => 'section-3_002d3'
@@ -7143,8 +7081,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                                         },
                                         'menus' => [
                                           {
-                                            'cmdname' => 'menu',
-                                            'extra' => {}
+                                            'cmdname' => 'menu'
                                           }
                                         ],
                                         'normalized' => 'unnumberedsec-3_002d4'
@@ -7193,8 +7130,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                         },
                         'menus' => [
                           {
-                            'cmdname' => 'menu',
-                            'extra' => {}
+                            'cmdname' => 'menu'
                           }
                         ],
                         'normalized' => 'unnumbered-4'
@@ -7210,8 +7146,7 @@ $result_nodes{'section_in_unnumbered_plaintext'} = {
                             },
                             'menus' => [
                               {
-                                'cmdname' => 'menu',
-                                'extra' => {}
+                                'cmdname' => 'menu'
                               }
                             ],
                             'normalized' => 'unnumberedsec-4'
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index 876e39254a..2e74179caa 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -236,9 +236,6 @@ $result_trees{'semi_auto'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -430,9 +427,6 @@ $result_trees{'semi_auto'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -682,7 +676,6 @@ 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'
 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1];
-$result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 $result_trees{'semi_auto'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'semi_auto'}{'contents'}[2];
 $result_trees{'semi_auto'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'semi_auto'}{'contents'}[2];
 $result_trees{'semi_auto'}{'contents'}[2]{'parent'} = 
$result_trees{'semi_auto'};
@@ -708,7 +701,6 @@ 
$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'
 
$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1];
-$result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 $result_trees{'semi_auto'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'semi_auto'}{'contents'}[4];
 $result_trees{'semi_auto'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'semi_auto'}{'contents'}[4];
 $result_trees{'semi_auto'}{'contents'}[4]{'parent'} = 
$result_trees{'semi_auto'};
@@ -877,8 +869,7 @@ $result_nodes{'semi_auto'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -896,8 +887,7 @@ $result_nodes{'semi_auto'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'Chap1'
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index 6f7bda436d..d5ec8f0eca 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -281,9 +281,6 @@ $result_trees{'space_in_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -505,7 +502,6 @@ 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'par
 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'space_in_node'}{'contents'}[1];
 $result_trees{'space_in_node'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'space_in_node'}{'contents'}[1];
 $result_trees{'space_in_node'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'space_in_node'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -561,8 +557,7 @@ $result_nodes{'space_in_node'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/special_spaces_in_nodes.pl 
b/tp/t/results/sectioning/special_spaces_in_nodes.pl
index 2cecc5996e..9aa78ba3a3 100644
--- a/tp/t/results/sectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/sectioning/special_spaces_in_nodes.pl
@@ -661,9 +661,6 @@ $result_trees{'special_spaces_in_nodes'} = {
               }
             }
           ],
-          "extra" => {
-            "end_command" => {}
-          },
           "parent" => {},
           "source_info" => {
             "file_name" => "special_spaces_in_nodes.texi",
@@ -1221,7 +1218,6 @@ 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[8]{"args"}[0]{"contents"}[0]{"parent"}
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[8]{"args"}[0];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[8]{"args"}[0]{"parent"}
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[8];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[8]{"parent"}
 = $result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2];
-$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"extra"}{"end_command"}
 = 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"contents"}[8];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[2]{"parent"}
 = $result_trees{'special_spaces_in_nodes'}{"contents"}[4];
 
$result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"contents"}[3]{"parent"}
 = $result_trees{'special_spaces_in_nodes'}{"contents"}[4];
 $result_trees{'special_spaces_in_nodes'}{"contents"}[4]{"parent"} = 
$result_trees{'special_spaces_in_nodes'};
@@ -1425,8 +1421,7 @@ $result_nodes{'special_spaces_in_nodes'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 
'EN-QUAD_007c_2002_007c-EM-QUAD_007c_2003_007c-EN-SPACE_007c_2002_007c'
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 5fae0aad47..4dbdb9e6a3 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -195,9 +195,6 @@ $result_trees{'top_node_no_menu_direction'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -344,7 +341,6 @@ 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'conte
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1];
-$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'top_node_no_menu_direction'}{'contents'}[1];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'top_node_no_menu_direction'}{'contents'}[1];
 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'top_node_no_menu_direction'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -385,8 +381,7 @@ $result_nodes{'top_node_no_menu_direction'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index 9b1bfcb667..2f8dca92bb 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -180,9 +180,6 @@ $result_trees{'top_node_up_url'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -294,7 +291,6 @@ 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'con
 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'top_node_up_url'}[0]{'contents'}[0]{'parent'};
@@ -459,8 +455,7 @@ $result_nodes{'top_node_up_url'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/topic_guide.pl 
b/tp/t/results/sectioning/topic_guide.pl
index e41cbad75a..0362cc50b4 100644
--- a/tp/t/results/sectioning/topic_guide.pl
+++ b/tp/t/results/sectioning/topic_guide.pl
@@ -282,9 +282,6 @@ $result_trees{'topic_guide'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'topic_guide.texi',
@@ -607,9 +604,6 @@ $result_trees{'topic_guide'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'topic_guide.texi',
@@ -811,9 +805,6 @@ $result_trees{'topic_guide'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'topic_guide.texi',
@@ -1046,9 +1037,6 @@ $result_trees{'topic_guide'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'topic_guide.texi',
@@ -1230,9 +1218,6 @@ $result_trees{'topic_guide'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'topic_guide.texi',
@@ -1447,9 +1432,6 @@ $result_trees{'topic_guide'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'topic_guide.texi',
@@ -1728,9 +1710,6 @@ $result_trees{'topic_guide'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'topic_guide.texi',
@@ -2015,9 +1994,6 @@ $result_trees{'topic_guide'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => 'topic_guide.texi',
@@ -2098,7 +2074,6 @@ 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'paren
 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
 
$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3];
-$result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'contents'}[2];
 $result_trees{'topic_guide'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[2];
 $result_trees{'topic_guide'}{'contents'}[2]{'contents'}[4]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[2];
 $result_trees{'topic_guide'}{'contents'}[2]{'parent'} = 
$result_trees{'topic_guide'};
@@ -2147,7 +2122,6 @@ 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'paren
 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
 
$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3];
-$result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'contents'}[3];
 $result_trees{'topic_guide'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[4];
 $result_trees{'topic_guide'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[4];
 $result_trees{'topic_guide'}{'contents'}[4]{'parent'} = 
$result_trees{'topic_guide'};
@@ -2177,7 +2151,6 @@ 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[1]{'paren
 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[2];
 
$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3];
-$result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'contents'}[2];
 $result_trees{'topic_guide'}{'contents'}[5]{'contents'}[3]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[5];
 $result_trees{'topic_guide'}{'contents'}[5]{'contents'}[4]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[5];
 $result_trees{'topic_guide'}{'contents'}[5]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[5]{'args'}[0]{'contents'}[0];
@@ -2212,7 +2185,6 @@ 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[1]{'paren
 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[2];
 
$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3];
-$result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'contents'}[2];
 $result_trees{'topic_guide'}{'contents'}[6]{'contents'}[3]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[6];
 $result_trees{'topic_guide'}{'contents'}[6]{'contents'}[4]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[6];
 $result_trees{'topic_guide'}{'contents'}[6]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[6]{'args'}[0]{'contents'}[0];
@@ -2238,7 +2210,6 @@ 
$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3]{'contents'}[0]{'paren
 
$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3]{'contents'}[1];
 
$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3];
-$result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3]{'contents'}[1];
 $result_trees{'topic_guide'}{'contents'}[7]{'contents'}[3]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[7];
 $result_trees{'topic_guide'}{'contents'}[7]{'contents'}[4]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[7];
 $result_trees{'topic_guide'}{'contents'}[7]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[7]{'args'}[0]{'contents'}[0];
@@ -2270,7 +2241,6 @@ 
$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[1]{'paren
 
$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[2];
 
$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3];
-$result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'contents'}[2];
 $result_trees{'topic_guide'}{'contents'}[8]{'contents'}[3]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[8];
 $result_trees{'topic_guide'}{'contents'}[8]{'contents'}[4]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[8];
 $result_trees{'topic_guide'}{'contents'}[8]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[8]{'args'}[0]{'contents'}[0];
@@ -2313,7 +2283,6 @@ 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[2]{'paren
 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[3]{'args'}[0];
 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[3];
 
$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[3]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3];
-$result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'contents'}[3];
 $result_trees{'topic_guide'}{'contents'}[9]{'contents'}[3]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[9];
 $result_trees{'topic_guide'}{'contents'}[9]{'contents'}[4]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[9];
 $result_trees{'topic_guide'}{'contents'}[9]{'extra'}{'node_content'}[0] = 
$result_trees{'topic_guide'}{'contents'}[9]{'args'}[0]{'contents'}[0];
@@ -2355,7 +2324,6 @@ 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[1]{'pare
 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[2]{'args'}[0];
 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[2];
 
$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3];
-$result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'contents'}[2];
 $result_trees{'topic_guide'}{'contents'}[11]{'contents'}[3]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[11];
 $result_trees{'topic_guide'}{'contents'}[11]{'contents'}[4]{'parent'} = 
$result_trees{'topic_guide'}{'contents'}[11];
 $result_trees{'topic_guide'}{'contents'}[11]{'parent'} = 
$result_trees{'topic_guide'};
@@ -2596,8 +2564,7 @@ $result_nodes{'topic_guide'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -2615,8 +2582,7 @@ $result_nodes{'topic_guide'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'guide1'
@@ -2627,8 +2593,7 @@ $result_nodes{'topic_guide'} = {
           'extra' => {
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'topic1'
@@ -2640,8 +2605,7 @@ $result_nodes{'topic_guide'} = {
               'extra' => {
                 'menus' => [
                   {
-                    'cmdname' => 'menu',
-                    'extra' => {}
+                    'cmdname' => 'menu'
                   }
                 ],
                 'normalized' => 'topic2'
@@ -2653,8 +2617,7 @@ $result_nodes{'topic_guide'} = {
                   'extra' => {
                     'menus' => [
                       {
-                        'cmdname' => 'menu',
-                        'extra' => {}
+                        'cmdname' => 'menu'
                       }
                     ],
                     'normalized' => 'topic3'
@@ -2665,8 +2628,7 @@ $result_nodes{'topic_guide'} = {
                       'extra' => {
                         'menus' => [
                           {
-                            'cmdname' => 'menu',
-                            'extra' => {}
+                            'cmdname' => 'menu'
                           }
                         ],
                         'normalized' => 'topic5'
@@ -2696,8 +2658,7 @@ $result_nodes{'topic_guide'} = {
             },
             'menus' => [
               {
-                'cmdname' => 'menu',
-                'extra' => {}
+                'cmdname' => 'menu'
               }
             ],
             'normalized' => 'guide2'
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index 1a168e0deb..0b51f6ba4e 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -289,9 +289,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -583,7 +580,6 @@ 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1];
-$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1];
 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'transliterated_split_equivalent_nodes'}[0]{'contents'}[0]{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -649,8 +645,7 @@ $result_nodes{'transliterated_split_equivalent_nodes'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 81a466c9b8..d58c362ee5 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -300,9 +300,6 @@ $result_trees{'two_nodes_at_the_end'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -635,7 +632,6 @@ 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]
 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'two_nodes_at_the_end'}[0]{'contents'}[0]{'parent'};
@@ -877,8 +873,7 @@ $result_nodes{'two_nodes_at_the_end'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 6799064d03..5e0d689e34 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -300,9 +300,6 @@ $result_trees{'two_nodes_between_chapters'} = [
                       }
                     }
                   ],
-                  'extra' => {
-                    'end_command' => {}
-                  },
                   'parent' => {},
                   'source_info' => {
                     'file_name' => '',
@@ -656,7 +653,6 @@ 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'content
 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0];
 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1];
-$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2];
 
$result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'}{'contents'}[2]{'parent'}
 = $result_trees{'two_nodes_between_chapters'}[0]{'contents'}[0]{'parent'};
@@ -992,8 +988,7 @@ $result_nodes{'two_nodes_between_chapters'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index dccc583a67..3aa6aa40c6 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -138,9 +138,6 @@ $result_trees{'unknown_node_in_menu'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -192,7 +189,6 @@ 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[
 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1];
-$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 $result_trees{'unknown_node_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} 
= $result_trees{'unknown_node_in_menu'}{'contents'}[1];
 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
 = 
$result_trees{'unknown_node_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -215,8 +211,7 @@ $result_nodes{'unknown_node_in_menu'} = {
   'extra' => {
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
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 2743ca763f..1dfc9a7189 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -167,7 +167,6 @@ $result_trees{'set_in_item_missing_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -314,7 +313,6 @@ $result_trees{'set_in_item_missing_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -350,7 +348,6 @@ 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'content
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'set_in_item_missing_line'}{'contents'}[0];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'set_in_item_missing_line'}{'contents'}[0];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -369,7 +366,6 @@ 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'content
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'set_in_item_missing_line'}{'contents'}[0];
 $result_trees{'set_in_item_missing_line'}{'contents'}[0]{'parent'} = 
$result_trees{'set_in_item_missing_line'};
 
diff --git a/tp/t/results/value/set_on_item_line.pl 
b/tp/t/results/value/set_on_item_line.pl
index 8b480a917e..138f1779ea 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -276,7 +276,6 @@ $result_trees{'set_on_item_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -565,7 +564,6 @@ $result_trees{'set_on_item_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -616,7 +614,6 @@ 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'
 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[3];
 $result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'set_on_item_line'}{'contents'}[0];
 $result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'set_on_item_line'}{'contents'}[0];
 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -655,7 +652,6 @@ 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'
 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
 $result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'set_on_item_line'}{'contents'}[0];
 $result_trees{'set_on_item_line'}{'contents'}[0]{'parent'} = 
$result_trees{'set_on_item_line'};
 
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 7854821776..aae9e01f36 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -1128,9 +1128,6 @@ $result_trees{'value_in_misc_commands'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2922,7 +2919,6 @@ 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'args'}[0];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48];
-$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'extra'}{'end_command'}
 = 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'contents'}[1];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[48]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[49]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2];
 
$result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[50]{'args'}[0]{'parent'}
 = $result_trees{'value_in_misc_commands'}{'contents'}[2]{'contents'}[50];
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 0a8af69099..d593f656ae 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -292,9 +292,6 @@ $result_trees{'value_in_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -558,9 +555,6 @@ $result_trees{'value_in_node'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -767,7 +761,6 @@ 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'par
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1];
-$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'value_in_node'}{'contents'}[2];
 $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'value_in_node'}{'contents'}[2];
 $result_trees{'value_in_node'}{'contents'}[2]{'parent'} = 
$result_trees{'value_in_node'};
@@ -804,7 +797,6 @@ 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'par
 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0];
 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3];
-$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'value_in_node'}{'contents'}[4];
 $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'value_in_node'}{'contents'}[4];
 $result_trees{'value_in_node'}{'contents'}[4]{'parent'} = 
$result_trees{'value_in_node'};
@@ -928,8 +920,7 @@ $result_nodes{'value_in_node'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
@@ -947,8 +938,7 @@ $result_nodes{'value_in_node'} = {
         },
         'menus' => [
           {
-            'cmdname' => 'menu',
-            'extra' => {}
+            'cmdname' => 'menu'
           }
         ],
         'normalized' => 'Node-1'
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 50b2146e71..e7dd52002b 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -607,7 +607,6 @@ $result_trees{'commands_and_spaces'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '  '
           },
           'parent' => {},
@@ -784,7 +783,6 @@ $result_trees{'commands_and_spaces'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -886,7 +884,6 @@ $result_trees{'commands_and_spaces'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => '  '
           },
@@ -1006,7 +1003,6 @@ $result_trees{'commands_and_spaces'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 5,
             'prototypes' => [
               {
@@ -1175,9 +1171,6 @@ $result_trees{'commands_and_spaces'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1246,9 +1239,6 @@ $result_trees{'commands_and_spaces'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1360,7 +1350,6 @@ $result_trees{'commands_and_spaces'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => '  '
           },
           'parent' => {},
@@ -1769,7 +1758,6 @@ $result_trees{'commands_and_spaces'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1911,7 +1899,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21]{'contents'}[
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21]{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21]{'contents'}[1]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21]{'extra'}{'end_command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21]{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[21]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[22]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[0];
@@ -1938,7 +1925,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[5];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[5]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'caption'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[1];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'end_command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[5];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'node_content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[1]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'shortcaption'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[3];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0];
@@ -1952,7 +1938,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'columnfractions'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'end_command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[26]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0];
@@ -1969,7 +1954,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'end_command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0];
@@ -1989,7 +1973,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[1]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'extra'}{'end_command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[32]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[33]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'args'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34];
@@ -1998,7 +1981,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'contents'}[
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'contents'}[1]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[34]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[35]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0];
@@ -2012,7 +1994,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'command_as_argument'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'extra'}{'end_command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[36]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[37]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38]{'contents'}[0]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[38];
@@ -2068,7 +2049,6 @@ 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'args'}[0];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2]{'parent'}
 = $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'extra'}{'end_command'}
 = 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[2];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[45]{'parent'} 
= $result_trees{'commands_and_spaces'}{'contents'}[1];
 
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index a4a256dd83..13852fff0e 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -104,8 +104,7 @@ $result_trees{'comments_end_lines'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -182,7 +181,6 @@ $result_trees{'comments_end_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1'
           },
           'parent' => {},
@@ -313,7 +311,6 @@ $result_trees{'comments_end_lines'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -401,9 +398,6 @@ $result_trees{'comments_end_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -489,9 +483,6 @@ $result_trees{'comments_end_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -577,9 +568,6 @@ $result_trees{'comments_end_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -751,7 +739,6 @@ $result_trees{'comments_end_lines'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -856,7 +843,6 @@ $result_trees{'comments_end_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -954,9 +940,6 @@ $result_trees{'comments_end_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1042,9 +1025,6 @@ $result_trees{'comments_end_lines'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1070,7 +1050,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2];
@@ -1079,7 +1058,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -1095,7 +1073,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1]
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6];
@@ -1106,7 +1083,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8];
@@ -1117,7 +1093,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1]
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10];
@@ -1128,7 +1103,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[11]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -1149,7 +1123,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[1
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'extra'}{'columnfractions'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[13]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'args'}[0];
@@ -1163,7 +1136,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'args'}[1]{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[14]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
@@ -1176,7 +1148,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[16]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[17]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18];
@@ -1187,7 +1158,6 @@ 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[18]{'parent'} = 
$result_trees{'comments_end_lines'}{'contents'}[0];
 $result_trees{'comments_end_lines'}{'contents'}[0]{'parent'} = 
$result_trees{'comments_end_lines'};
 
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 8d8803c2e5..d4760a0590 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
@@ -104,7 +104,6 @@ $result_trees{'comments_on_block_command_lines'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -213,7 +212,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -330,7 +328,6 @@ $result_trees{'comments_on_block_command_lines'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -454,7 +451,6 @@ $result_trees{'comments_on_block_command_lines'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -557,7 +553,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => '1',
             'spaces_before_argument' => ' '
           },
@@ -667,7 +662,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'enumerate_specification' => 'a',
             'spaces_before_argument' => ' '
           },
@@ -799,7 +793,6 @@ $result_trees{'comments_on_block_command_lines'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -887,7 +880,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -981,7 +973,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1069,7 +1060,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1157,7 +1147,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1288,7 +1277,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1406,7 +1394,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1534,7 +1521,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1622,7 +1608,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1796,7 +1781,6 @@ $result_trees{'comments_on_block_command_lines'} = {
           ],
           'extra' => {
             'columnfractions' => {},
-            'end_command' => {},
             'max_columns' => 2,
             'spaces_before_argument' => ' '
           },
@@ -1966,7 +1950,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'max_columns' => 2,
             'prototypes' => [
               {
@@ -2093,7 +2076,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'node_content' => [
               {}
             ],
@@ -2191,7 +2173,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2279,7 +2260,6 @@ $result_trees{'comments_on_block_command_lines'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2313,7 +2293,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
@@ -2326,7 +2305,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'args'}[0];
@@ -2340,7 +2318,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
@@ -2355,7 +2332,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[7]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'extra'}{'comment_at_end'};
@@ -2367,7 +2343,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[8]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[9]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'args'}[0];
@@ -2380,7 +2355,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[10]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[11]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'args'}[0];
@@ -2396,7 +2370,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[13]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'extra'}{'comment_at_end'};
@@ -2407,7 +2380,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[14]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[15]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'args'}[0];
@@ -2419,7 +2391,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[16]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[17]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'extra'}{'comment_at_end'};
@@ -2430,7 +2401,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[18]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[19]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'extra'}{'comment_at_end'};
@@ -2441,7 +2411,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[20]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[21]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'args'}[0];
@@ -2459,7 +2428,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[22]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[23]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'args'}[0];
@@ -2475,7 +2443,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[24]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[25]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'args'}[0];
@@ -2493,7 +2460,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[26]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[27]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'args'}[0]{'extra'}{'comment_at_end'};
@@ -2504,7 +2470,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[28]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[29]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -2525,7 +2490,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'extra'}{'columnfractions'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[31]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[0];
@@ -2547,7 +2511,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'prototypes'}[0]{'contents'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'prototypes'}[1]{'contents'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[2]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'extra'}{'prototypes_line'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[0];
@@ -2565,7 +2528,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'extra'}{'node_content'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'args'}[1]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'args'}[0]{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[34]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
@@ -2578,7 +2540,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[36]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[37]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'extra'}{'comment_at_end'};
@@ -2589,7 +2550,6 @@ 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'contents'}[1]{'parent'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'extra'}{'end_command'}
 = 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'contents'}[1];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[38]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[39]{'parent'}
 = $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
 $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'parent'} = 
$result_trees{'comments_on_block_command_lines'};
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 015de5616c..b0112b72c8 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -370,9 +370,6 @@ $result_trees{'image_inline_or_not'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -487,7 +484,6 @@ $result_trees{'image_inline_or_not'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -746,7 +742,6 @@ $result_trees{'image_inline_or_not'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1087,9 +1082,6 @@ $result_trees{'image_inline_or_not'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1580,7 +1572,6 @@ $result_trees{'image_inline_or_not'} = {
           ],
           'extra' => {
             'caption' => {},
-            'end_command' => {},
             'float_section' => {},
             'node_content' => [
               {}
@@ -1664,7 +1655,6 @@ 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6]{'contents'}[0
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6]{'contents'}[1];
 $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[6]{'parent'} = 
$result_trees{'image_inline_or_not'}{'contents'}[2];
 $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[7]{'parent'} = 
$result_trees{'image_inline_or_not'}{'contents'}[2];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
@@ -1678,7 +1668,6 @@ 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[1
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2]{'parent'}
 = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'extra'}{'end_command'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'contents'}[2];
 $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[8]{'parent'} = 
$result_trees{'image_inline_or_not'}{'contents'}[2];
 $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[9]{'parent'} = 
$result_trees{'image_inline_or_not'}{'contents'}[2];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0];
@@ -1712,7 +1701,6 @@ 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[1];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'command_as_argument'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'end_command'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[1];
 $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'parent'} 
= $result_trees{'image_inline_or_not'}{'contents'}[2];
 $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[11]{'parent'} 
= $result_trees{'image_inline_or_not'}{'contents'}[2];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'args'}[0]{'parent'}
 = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12];
@@ -1763,7 +1751,6 @@ 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'args'}[0];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3];
 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3]{'parent'}
 = $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12];
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'extra'}{'end_command'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[3];
 $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'parent'} 
= $result_trees{'image_inline_or_not'}{'contents'}[2];
 $result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[13]{'parent'} 
= $result_trees{'image_inline_or_not'}{'contents'}[2];
 $result_trees{'image_inline_or_not'}{'contents'}[2]{'parent'} = 
$result_trees{'image_inline_or_not'};
@@ -1829,7 +1816,6 @@ 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'contents'}[6
 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'contents'}[6];
 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'contents'}[6]{'parent'}
 = $result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6];
 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'extra'}{'caption'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'contents'}[4];
-$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'extra'}{'end_command'}
 = 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'contents'}[6];
 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'extra'}{'float_section'}
 = $result_trees{'image_inline_or_not'}{'contents'}[4];
 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'extra'}{'node_content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'args'}[1]{'contents'}[0];
 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'extra'}{'type'}{'content'}[0]
 = 
$result_trees{'image_inline_or_not'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'}[0];
@@ -2006,8 +1992,7 @@ $result_nodes{'image_inline_or_not'} = {
     },
     'menus' => [
       {
-        'cmdname' => 'menu',
-        'extra' => {}
+        'cmdname' => 'menu'
       }
     ],
     'normalized' => 'Top'
diff --git a/tp/t/results/xml_tests/raw.pl b/tp/t/results/xml_tests/raw.pl
index f847fab0d1..65f8740a48 100644
--- a/tp/t/results/xml_tests/raw.pl
+++ b/tp/t/results/xml_tests/raw.pl
@@ -64,9 +64,6 @@ $result_trees{'raw'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -142,9 +139,6 @@ $result_trees{'raw'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -169,7 +163,6 @@ 
$result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $r
 
$result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'raw'}{'contents'}[0]{'contents'}[0];
-$result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'} = 
$result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'raw'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'raw'}{'contents'}[0];
 $result_trees{'raw'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'raw'}{'contents'}[0];
 $result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'raw'}{'contents'}[0]{'contents'}[2];
@@ -179,7 +172,6 @@ 
$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]
 
$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 $result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'raw'}{'contents'}[0]{'contents'}[2];
 $result_trees{'raw'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'raw'}{'contents'}[0];
 $result_trees{'raw'}{'contents'}[0]{'parent'} = $result_trees{'raw'};
diff --git a/tp/t/results/xml_tests/raw_and_comments.pl 
b/tp/t/results/xml_tests/raw_and_comments.pl
index 2dd7ac6b79..705a6e4e32 100644
--- a/tp/t/results/xml_tests/raw_and_comments.pl
+++ b/tp/t/results/xml_tests/raw_and_comments.pl
@@ -98,7 +98,6 @@ $result_trees{'raw_and_comments'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '  '
           },
           'parent' => {},
@@ -210,7 +209,6 @@ $result_trees{'raw_and_comments'} = {
                 }
               ],
               'extra' => {
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -241,7 +239,6 @@ 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0];
-$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[0];
 $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2];
@@ -255,7 +252,6 @@ 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'extra'}{'comment_at_end'}{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
-$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2];
 $result_trees{'raw_and_comments'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'raw_and_comments'}{'contents'}[0];
 $result_trees{'raw_and_comments'}{'contents'}[0]{'parent'} = 
$result_trees{'raw_and_comments'};
diff --git a/tp/t/results/xml_tests/spaces_info_lost.pl 
b/tp/t/results/xml_tests/spaces_info_lost.pl
index d9727f88d0..c09c46258c 100644
--- a/tp/t/results/xml_tests/spaces_info_lost.pl
+++ b/tp/t/results/xml_tests/spaces_info_lost.pl
@@ -70,7 +70,6 @@ $result_trees{'spaces_info_lost'} = {
             }
           ],
           'extra' => {
-            'end_command' => {},
             'spaces_before_argument' => '  '
           },
           'parent' => {},
@@ -132,7 +131,6 @@ 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'
 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0];
-$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'spaces_info_lost'}{'contents'}[0];
 $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'spaces_info_lost'}{'contents'}[0];
 
$result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'spaces_associated_command'}
 = $result_trees{'spaces_info_lost'}{'contents'}[0]{'contents'}[2];
diff --git a/tp/t/results/xtable/accent_on_table_line.pl 
b/tp/t/results/xtable/accent_on_table_line.pl
index 91a7cbcf01..1d51994e9b 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -175,7 +175,6 @@ $result_trees{'accent_on_table_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -364,7 +363,6 @@ $result_trees{'accent_on_table_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -401,7 +399,6 @@ 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[
 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'accent_on_table_line'}{'contents'}[0];
 $result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[1]{'parent'} 
= $result_trees{'accent_on_table_line'}{'contents'}[0];
 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2];
@@ -425,7 +422,6 @@ 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[
 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
 $result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'parent'} 
= $result_trees{'accent_on_table_line'}{'contents'}[0];
 $result_trees{'accent_on_table_line'}{'contents'}[0]{'parent'} = 
$result_trees{'accent_on_table_line'};
 
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index b017584b3e..baec2cdd13 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -305,9 +305,6 @@ $result_trees{'block_commands_in_table'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -479,9 +476,6 @@ $result_trees{'block_commands_in_table'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -602,9 +596,6 @@ $result_trees{'block_commands_in_table'} = {
                           }
                         }
                       ],
-                      'extra' => {
-                        'end_command' => {}
-                      },
                       'parent' => {},
                       'source_info' => {
                         'file_name' => '',
@@ -652,7 +643,6 @@ $result_trees{'block_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -906,7 +896,6 @@ $result_trees{'block_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1107,7 +1096,6 @@ $result_trees{'block_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1306,7 +1294,6 @@ $result_trees{'block_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1377,7 +1364,6 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1];
@@ -1400,7 +1386,6 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
@@ -1416,7 +1401,6 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1];
@@ -1424,7 +1408,6 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0];
@@ -1463,7 +1446,6 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[3]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'args'}[0];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4];
@@ -1494,7 +1476,6 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'contents'}[1];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[4]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[5]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[6];
@@ -1521,7 +1502,6 @@ 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'contents
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'contents'}[2];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'contents'}[2];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[7]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[8]{'contents'}[0]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[8];
 
$result_trees{'block_commands_in_table'}{'contents'}[2]{'contents'}[8]{'parent'}
 = $result_trees{'block_commands_in_table'}{'contents'}[2];
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 58f2c909d0..4b12ff84d9 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -131,7 +131,6 @@ $result_trees{'comment_and_itemx_before_item'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -162,7 +161,6 @@ 
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'co
 
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'comment_and_itemx_before_item'}{'contents'}[0];
 $result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'parent'} = 
$result_trees{'comment_and_itemx_before_item'};
 
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl 
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index 0d6b420383..ed10ee4a46 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -196,7 +196,6 @@ $result_trees{'definfoenclose_on_table_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -235,7 +234,6 @@ 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'con
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[0];
 $result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'parent'} = 
$result_trees{'definfoenclose_on_table_line'};
 
diff --git a/tp/t/results/xtable/empty_item_itemx.pl 
b/tp/t/results/xtable/empty_item_itemx.pl
index e9589e8b91..e358b3cbb2 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -295,7 +295,6 @@ $result_trees{'empty_item_itemx'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -351,7 +350,6 @@ 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[4];
 $result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'empty_item_itemx'}{'contents'}[0];
 $result_trees{'empty_item_itemx'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_item_itemx'};
 
diff --git a/tp/t/results/xtable/headitem_in_table.pl 
b/tp/t/results/xtable/headitem_in_table.pl
index 6964ea881b..a24860afba 100644
--- a/tp/t/results/xtable/headitem_in_table.pl
+++ b/tp/t/results/xtable/headitem_in_table.pl
@@ -152,7 +152,6 @@ $result_trees{'headitem_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -188,7 +187,6 @@ 
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{
 
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 $result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'headitem_in_table'}{'contents'}[0];
 $result_trees{'headitem_in_table'}{'contents'}[0]{'parent'} = 
$result_trees{'headitem_in_table'};
 
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 ec983229f2..63d5668bc4 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -312,7 +312,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -519,7 +518,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -943,7 +941,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1139,7 +1136,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1311,7 +1307,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1507,7 +1502,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1679,7 +1673,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -1852,7 +1845,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2019,7 +2011,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2186,7 +2177,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2447,7 +2437,6 @@ $result_trees{'inter_item_commands_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -2523,7 +2512,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'con
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'args'}[0];
@@ -2554,7 +2542,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'con
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'args'}[0];
@@ -2619,7 +2606,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'con
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[6]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'args'}[0];
@@ -2646,7 +2632,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'con
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[8]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'args'}[0];
@@ -2670,7 +2655,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'con
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[10]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'args'}[0];
@@ -2697,7 +2681,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'co
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[12]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'args'}[0];
@@ -2721,7 +2704,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'co
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[14]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'args'}[0];
@@ -2745,7 +2727,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'co
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[16]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'args'}[0];
@@ -2768,7 +2749,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'co
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[18]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'args'}[0];
@@ -2791,7 +2771,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'co
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[20]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'args'}[0];
@@ -2829,7 +2808,6 @@ 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'co
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[2]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[22]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
 
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'parent'}
 = $result_trees{'inter_item_commands_in_table'}{'contents'}[4];
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 64232eaba7..4ab0cae4e1 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
@@ -345,7 +345,6 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -385,9 +384,6 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -444,12 +440,10 @@ 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'content
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0];
 
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'parent'}
 = $result_trees{'inter_item_commands_in_table_in_example'};
 
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 7a4cd60ab6..0df82c9ceb 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
@@ -98,7 +98,6 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -127,7 +126,6 @@ 
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0
 
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0];
 $result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'parent'} = 
$result_trees{'invalid_command_and_brace_in_table'};
 
diff --git a/tp/t/results/xtable/itemx_before_item.pl 
b/tp/t/results/xtable/itemx_before_item.pl
index 5a1fbd5aaf..bbb84a4084 100644
--- a/tp/t/results/xtable/itemx_before_item.pl
+++ b/tp/t/results/xtable/itemx_before_item.pl
@@ -107,7 +107,6 @@ $result_trees{'itemx_before_item'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -135,7 +134,6 @@ 
$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{
 
$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'itemx_before_item'}{'contents'}[0];
 $result_trees{'itemx_before_item'}{'contents'}[0]{'parent'} = 
$result_trees{'itemx_before_item'};
 
diff --git a/tp/t/results/xtable/long_item.pl b/tp/t/results/xtable/long_item.pl
index 4538d4e786..bb8c49f167 100644
--- a/tp/t/results/xtable/long_item.pl
+++ b/tp/t/results/xtable/long_item.pl
@@ -158,7 +158,6 @@ $result_trees{'long_item'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -193,7 +192,6 @@ 
$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[
 
$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'long_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'long_item'}{'contents'}[0];
 $result_trees{'long_item'}{'contents'}[0]{'parent'} = 
$result_trees{'long_item'};
 
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 10884e2109..128c084016 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
@@ -113,7 +113,6 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -142,7 +141,6 @@ 
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0
 
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0];
 $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'parent'} = 
$result_trees{'no_arg_brace_command_on_table_line'};
 
diff --git a/tp/t/results/xtable/no_argument_for_table.pl 
b/tp/t/results/xtable/no_argument_for_table.pl
index 89f82540c0..0577b47a02 100644
--- a/tp/t/results/xtable/no_argument_for_table.pl
+++ b/tp/t/results/xtable/no_argument_for_table.pl
@@ -117,8 +117,7 @@ $result_trees{'no_argument_for_table'} = {
             }
           ],
           'extra' => {
-            'command_as_argument' => {},
-            'end_command' => {}
+            'command_as_argument' => {}
           },
           'parent' => {},
           'source_info' => {
@@ -148,7 +147,6 @@ 
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'contents'}
 
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 $result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'parent'} 
= $result_trees{'no_argument_for_table'}{'contents'}[0];
 $result_trees{'no_argument_for_table'}{'contents'}[0]{'parent'} = 
$result_trees{'no_argument_for_table'};
 
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index c3c85fd764..8c6bdda5db 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -507,7 +507,6 @@ $result_trees{'table_nested'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -706,7 +705,6 @@ $result_trees{'table_nested'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -757,9 +755,6 @@ $result_trees{'table_nested'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1106,7 +1101,6 @@ $result_trees{'table_nested'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -1305,7 +1299,6 @@ $result_trees{'table_nested'} = {
               ],
               'extra' => {
                 'command_as_argument' => {},
-                'end_command' => {},
                 'spaces_before_argument' => ' '
               },
               'parent' => {},
@@ -1356,9 +1349,6 @@ $result_trees{'table_nested'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -1719,7 +1709,6 @@ $result_trees{'table_nested'} = {
                   ],
                   'extra' => {
                     'command_as_argument' => {},
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1918,7 +1907,6 @@ $result_trees{'table_nested'} = {
                   ],
                   'extra' => {
                     'command_as_argument' => {},
-                    'end_command' => {},
                     'spaces_before_argument' => ' '
                   },
                   'parent' => {},
@@ -1969,9 +1957,6 @@ $result_trees{'table_nested'} = {
                   }
                 }
               ],
-              'extra' => {
-                'end_command' => {}
-              },
               'parent' => {},
               'source_info' => {
                 'file_name' => '',
@@ -2009,9 +1994,6 @@ $result_trees{'table_nested'} = {
               }
             }
           ],
-          'extra' => {
-            'end_command' => {}
-          },
           'parent' => {},
           'source_info' => {
             'file_name' => '',
@@ -2101,7 +2083,6 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[3];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[3];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
@@ -2128,14 +2109,12 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[4];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[5]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[5];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[5]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'contents'}[5];
 $result_trees{'table_nested'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[0];
 $result_trees{'table_nested'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[6];
@@ -2187,7 +2166,6 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[3];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[3];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[1];
@@ -2214,14 +2192,12 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'cont
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'extra'}{'end_command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[2]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[3];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[4]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[4];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[4]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'contents'}[4];
 $result_trees{'table_nested'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[0];
 $result_trees{'table_nested'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[9];
@@ -2274,7 +2250,6 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'con
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[3];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[2];
@@ -2301,19 +2276,16 @@ 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'con
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[3]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[3];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[3]{'contents'}[2];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[4];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[5]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[5];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[5];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'extra'}{'end_command'}
 = $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'contents'}[1];
 $result_trees{'table_nested'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'table_nested'}{'contents'}[0];
 $result_trees{'table_nested'}{'contents'}[0]{'parent'} = 
$result_trees{'table_nested'};
 
diff --git a/tp/t/results/xtable/text_between_item_itemx.pl 
b/tp/t/results/xtable/text_between_item_itemx.pl
index b1bee5edda..1434b5f29f 100644
--- a/tp/t/results/xtable/text_between_item_itemx.pl
+++ b/tp/t/results/xtable/text_between_item_itemx.pl
@@ -152,7 +152,6 @@ $result_trees{'text_between_item_itemx'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -186,7 +185,6 @@ 
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents
 
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'text_between_item_itemx'}{'contents'}[0];
 $result_trees{'text_between_item_itemx'}{'contents'}[0]{'parent'} = 
$result_trees{'text_between_item_itemx'};
 
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 6599249143..a0ba7334a5 100644
--- a/tp/t/results/xtable/title_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/title_and_itemx_before_item.pl
@@ -124,7 +124,6 @@ $result_trees{'title_and_itemx_before_item'} = {
           ],
           'extra' => {
             'command_as_argument' => {},
-            'end_command' => {},
             'spaces_before_argument' => ' '
           },
           'parent' => {},
@@ -155,7 +154,6 @@ 
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'cont
 
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0];
 
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
 
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'title_and_itemx_before_item'}{'contents'}[0];
 $result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'parent'} = 
$result_trees{'title_and_itemx_before_item'};
 
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 7e0a7f4ca5..bb20b29611 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -455,7 +455,7 @@ sub new_test($;$$$)
 my @contents_keys = ('contents', 'args', 'parent',
   'source_info', 'node_content',  'nodes_manuals', 'misc_content',
   'invalid_nesting', 'block_command_line_contents', 'spaces_after_command',
-  'spaces_before_argument', 'end_command', 'text_arg');
+  'spaces_before_argument', 'text_arg');
 my @menus_keys = ('menu_next', 'menu_up', 'menu_prev', 'menu_up_hash');
 # 'section_number' is kept in other results as it may be the only clue
 # to know which section element it is.



reply via email to

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