texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Remove command_argument extra key


From: Patrice Dumas
Subject: branch master updated: Remove command_argument extra key
Date: Wed, 07 Sep 2022 10:39:39 -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 071b7a0bca Remove command_argument extra key
071b7a0bca is described below

commit 071b7a0bca123b26a1ff3b4d2da8a7063b01a41b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Sep 7 16:39:24 2022 +0200

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

diff --git a/ChangeLog b/ChangeLog
index 9bd591377c..cef5d76d8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-09-07  Patrice Dumas  <pertusus@free.fr>
+
+       Remove command_argument 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): remove
+       'command_argument' extra @end command element key, it is
+       redundant.
+
 2022-09-07  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Structuring.pm (new_block_command): do a tree with
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 6e134369b5..f75023358f 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3306,8 +3306,6 @@ sub _end_line($$$)
                   $end_command = undef;
                 }
               }
-              $current->{'extra'}->{'command_argument'} = $end_command
-                if (defined($end_command));
             }
             # non ascii spaces are also superfluous arguments
             if (($superfluous_arg or $line =~ /\S/)
@@ -7428,7 +7426,6 @@ The corresponding command is in 
I<spaces_associated_command>.
 
 =item C<@end>
 
-The textual argument is in I<command_argument>.
 The corresponding @-command is in I<command>.
 
 =item C<@enumerate>
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 5416754bdf..61184856bc 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1514,7 +1514,6 @@ sub new_block_command($$$)
 
   my $end = {'cmdname' => 'end', 'extra' =>
                  {'spaces_before_argument' => ' ',
-                  'command_argument' => $command_name,
                   'text_arg' => $command_name}};
   push @{$end->{'args'}},
     {'type' => 'line_arg', 'parent' => $end,
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index b9d17e1f7d..7b6281d019 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1396,11 +1396,6 @@ end_line_misc_line (ELEMENT *current)
                               free (end_command); end_command = 0;
                             }
                         }
-                      if (end_command)
-                        {
-                          add_extra_string (current, "command_argument",
-                                            end_command);
-                        }
                       if (end_command
                           && (superfluous_arg
                              || line[strspn (line, whitespace_chars)] != '\0'))
diff --git a/tp/t/results/alias/alias_table_command.pl 
b/tp/t/results/alias/alias_table_command.pl
index 4a56b593a3..b7eb996f5c 100644
--- a/tp/t/results/alias/alias_table_command.pl
+++ b/tp/t/results/alias/alias_table_command.pl
@@ -132,7 +132,6 @@ $result_trees{'alias_table_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/columnfractions/empty.pl 
b/tp/t/results/columnfractions/empty.pl
index 116d127514..4c8484b8e9 100644
--- a/tp/t/results/columnfractions/empty.pl
+++ b/tp/t/results/columnfractions/empty.pl
@@ -58,7 +58,6 @@ $result_trees{'empty'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/columnfractions/empty_comment.pl 
b/tp/t/results/columnfractions/empty_comment.pl
index 788b153f19..cc95da7513 100644
--- a/tp/t/results/columnfractions/empty_comment.pl
+++ b/tp/t/results/columnfractions/empty_comment.pl
@@ -75,7 +75,6 @@ $result_trees{'empty_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/columnfractions/good.pl 
b/tp/t/results/columnfractions/good.pl
index fa816717eb..de3a6f94d7 100644
--- a/tp/t/results/columnfractions/good.pl
+++ b/tp/t/results/columnfractions/good.pl
@@ -68,7 +68,6 @@ $result_trees{'good'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/columnfractions/good_comment.pl 
b/tp/t/results/columnfractions/good_comment.pl
index 4b175a217b..88971dc841 100644
--- a/tp/t/results/columnfractions/good_comment.pl
+++ b/tp/t/results/columnfractions/good_comment.pl
@@ -84,7 +84,6 @@ $result_trees{'good_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/columnfractions/good_space_comment.pl 
b/tp/t/results/columnfractions/good_space_comment.pl
index dbbd76b0de..377a4a40ba 100644
--- a/tp/t/results/columnfractions/good_space_comment.pl
+++ b/tp/t/results/columnfractions/good_space_comment.pl
@@ -84,7 +84,6 @@ $result_trees{'good_space_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/columnfractions/invalid.pl 
b/tp/t/results/columnfractions/invalid.pl
index 15fa961080..66d10a0ee7 100644
--- a/tp/t/results/columnfractions/invalid.pl
+++ b/tp/t/results/columnfractions/invalid.pl
@@ -63,7 +63,6 @@ $result_trees{'invalid'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/columnfractions/not_fraction.pl 
b/tp/t/results/columnfractions/not_fraction.pl
index b9040dbb7c..ea1e91e4f6 100644
--- a/tp/t/results/columnfractions/not_fraction.pl
+++ b/tp/t/results/columnfractions/not_fraction.pl
@@ -63,7 +63,6 @@ $result_trees{'not_fraction'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/columnfractions/something_before_columnfractions.pl 
b/tp/t/results/columnfractions/something_before_columnfractions.pl
index 4901830ebd..e57b05bb39 100644
--- a/tp/t/results/columnfractions/something_before_columnfractions.pl
+++ b/tp/t/results/columnfractions/something_before_columnfractions.pl
@@ -71,7 +71,6 @@ $result_trees{'something_before_columnfractions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/columnfractions/wrong_command.pl 
b/tp/t/results/columnfractions/wrong_command.pl
index 020155c246..0243a0a3a9 100644
--- a/tp/t/results/columnfractions/wrong_command.pl
+++ b/tp/t/results/columnfractions/wrong_command.pl
@@ -81,7 +81,6 @@ $result_trees{'wrong_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/conditionals/many_conditionals.pl 
b/tp/t/results/conditionals/many_conditionals.pl
index 46e4e75cb6..196aed0954 100644
--- a/tp/t/results/conditionals/many_conditionals.pl
+++ b/tp/t/results/conditionals/many_conditionals.pl
@@ -53,7 +53,6 @@ $result_trees{'many_conditionals'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -172,7 +171,6 @@ $result_trees{'many_conditionals'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
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 9a0069345d..479baaf612 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -311,7 +311,6 @@ $result_trees{'at_commands_in_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -433,7 +432,6 @@ $result_trees{'at_commands_in_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
diff --git a/tp/t/results/converters_tests/combined_fonts.pl 
b/tp/t/results/converters_tests/combined_fonts.pl
index 8c2c829dc0..136c9c5a36 100644
--- a/tp/t/results/converters_tests/combined_fonts.pl
+++ b/tp/t/results/converters_tests/combined_fonts.pl
@@ -1371,7 +1371,6 @@ $result_trees{'combined_fonts'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 0659a0b477..7a43bfb392 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1038,7 +1038,6 @@ $result_trees{'complex_nestings'} = {
                                           ],
                                           'cmdname' => 'end',
                                           'extra' => {
-                                            'command_argument' => 'table',
                                             'spaces_before_argument' => ' ',
                                             'text_arg' => 'table'
                                           },
@@ -1102,7 +1101,6 @@ $result_trees{'complex_nestings'} = {
                                   ],
                                   'cmdname' => 'end',
                                   'extra' => {
-                                    'command_argument' => 'defvar',
                                     'spaces_before_argument' => ' ',
                                     'text_arg' => 'defvar'
                                   },
@@ -1148,7 +1146,6 @@ $result_trees{'complex_nestings'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'deffn',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'deffn'
                           },
@@ -1194,7 +1191,6 @@ $result_trees{'complex_nestings'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'defun',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'defun'
                   },
@@ -1248,7 +1244,6 @@ $result_trees{'complex_nestings'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index c0c06cf58f..33850a3164 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -354,7 +354,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -612,7 +611,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -906,7 +904,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -5105,7 +5102,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defspec',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
@@ -7235,7 +7231,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defspec',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
@@ -8357,7 +8352,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -10020,7 +10014,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defspec',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
@@ -10376,7 +10369,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -10768,7 +10760,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -10983,7 +10974,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -11207,7 +11197,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -11577,7 +11566,6 @@ $result_trees{'definition_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'deftypefn',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'deftypefn'
                   },
@@ -11619,7 +11607,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -11883,7 +11870,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
@@ -12162,7 +12148,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
@@ -12660,7 +12645,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -17306,7 +17290,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -21566,7 +21549,6 @@ $result_trees{'definition_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
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 0f1b5ac95d..decc1c9989 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
@@ -119,7 +119,6 @@ $result_trees{'email_table_command_as_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/converters_tests/enumerate_above_ten.pl 
b/tp/t/results/converters_tests/enumerate_above_ten.pl
index 7a4a06fd3a..8317ac478c 100644
--- a/tp/t/results/converters_tests/enumerate_above_ten.pl
+++ b/tp/t/results/converters_tests/enumerate_above_ten.pl
@@ -73,7 +73,6 @@ $result_trees{'enumerate_above_ten'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 471c92b811..5961a97999 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -375,7 +375,6 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -728,7 +727,6 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -947,7 +945,6 @@ $result_trees{'form_feeds'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 9bd7207562..e9298a668e 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -299,7 +299,6 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -631,7 +630,6 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -937,7 +935,6 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -1174,7 +1171,6 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1506,7 +1502,6 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -1812,7 +1807,6 @@ $result_trees{'frenchspacing_and_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 892c5e6187..122c627583 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2050,7 +2050,6 @@ $result_trees{'image_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
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 486c512c2f..9755b63758 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -350,7 +350,6 @@ $result_trees{'index_entry_in_preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/converters_tests/line_breaks.pl 
b/tp/t/results/converters_tests/line_breaks.pl
index e4f9f8d0b0..1a14bc5b9c 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -61,7 +61,6 @@ $result_trees{'line_breaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'documentdescription',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'documentdescription'
               },
@@ -355,7 +354,6 @@ $result_trees{'line_breaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -442,7 +440,6 @@ $result_trees{'line_breaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index 8fc2cf712f..4b2caddf6e 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -278,7 +278,6 @@ $result_trees{'non_empty_part'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 6a8326e432..5c02906035 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
@@ -278,7 +278,6 @@ $result_trees{'non_empty_part_no_top_node_output'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 dcf4bedab3..04d43f999f 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -101,7 +101,6 @@ $result_trees{'normal_font_in_monospace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/converters_tests/raw_block_commands.pl 
b/tp/t/results/converters_tests/raw_block_commands.pl
index 8424c52b12..ee75d5c122 100644
--- a/tp/t/results/converters_tests/raw_block_commands.pl
+++ b/tp/t/results/converters_tests/raw_block_commands.pl
@@ -63,7 +63,6 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -139,7 +138,6 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'xml',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'xml'
               },
@@ -215,7 +213,6 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'docbook',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'docbook'
               },
@@ -332,7 +329,6 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
@@ -457,7 +453,6 @@ $result_trees{'raw_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'latex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'latex'
               },
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 6dac724943..e196ca3a8f 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
@@ -63,7 +63,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -139,7 +138,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'xml',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'xml'
               },
@@ -215,7 +213,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'docbook',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'docbook'
               },
@@ -332,7 +329,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
@@ -457,7 +453,6 @@ $result_trees{'raw_block_commands_expand_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'latex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'latex'
               },
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index ad53c069ca..1e99057212 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -428,7 +428,6 @@ $result_trees{'ref_in_sectioning'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 20fe44466f..2f8ecdb409 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
@@ -145,7 +145,6 @@ $result_trees{'references_to_top_no_top_output'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -606,7 +605,6 @@ $result_trees{'references_to_top_no_top_output'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -1197,7 +1195,6 @@ $result_trees{'references_to_top_no_top_output'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 d344ff25b4..1526a35272 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
@@ -474,7 +474,6 @@ $result_trees{'some_at_commands_in_ref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/converters_tests/sp_in_example.pl 
b/tp/t/results/converters_tests/sp_in_example.pl
index 1514c64aeb..3f845f781a 100644
--- a/tp/t/results/converters_tests/sp_in_example.pl
+++ b/tp/t/results/converters_tests/sp_in_example.pl
@@ -270,7 +270,6 @@ $result_trees{'sp_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 a67a9156f2..d6878ed9cf 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
@@ -268,7 +268,6 @@ $result_trees{'spaces_in_empty_node_names'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 c27dc53cf7..a4bb303914 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -283,7 +283,6 @@ $result_trees{'spaces_in_node_names'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 3c1b73c95e..6ff9b58acd 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
@@ -139,7 +139,6 @@ $result_trees{'table_in_display_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'table',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'table'
                       },
@@ -182,7 +181,6 @@ $result_trees{'table_in_display_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'display',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'display'
                   },
@@ -223,7 +221,6 @@ $result_trees{'table_in_display_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 e01a16be30..983c2a4ef0 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
@@ -139,7 +139,6 @@ $result_trees{'table_in_example_in_display'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'table',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'table'
                       },
@@ -182,7 +181,6 @@ $result_trees{'table_in_example_in_display'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -223,7 +221,6 @@ $result_trees{'table_in_example_in_display'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'display',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 718e3c2a8d..d55059ccc2 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -376,7 +376,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
@@ -532,7 +531,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -725,7 +723,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -903,7 +900,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -1081,7 +1077,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -1274,7 +1269,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -1414,7 +1408,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -1628,7 +1621,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
@@ -1784,7 +1776,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -1977,7 +1968,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -2155,7 +2145,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -2333,7 +2322,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -2526,7 +2514,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -2666,7 +2653,6 @@ $result_trees{'test_deftypefnnewline'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index ce6e4076f5..9c132b9933 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -369,7 +369,6 @@ $result_trees{'things_before_setfilename'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'float',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
@@ -560,7 +559,6 @@ $result_trees{'things_before_setfilename'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'float',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
@@ -713,7 +711,6 @@ $result_trees{'things_before_setfilename'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'menu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
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 d905cc9f62..b2f60258f3 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
@@ -369,7 +369,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'float',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
@@ -560,7 +559,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'float',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
@@ -713,7 +711,6 @@ $result_trees{'things_before_setfilename_no_element'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'menu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
diff --git a/tp/t/results/coverage/block_commands.pl 
b/tp/t/results/coverage/block_commands.pl
index f450c9f8c6..4ce0b65fbe 100644
--- a/tp/t/results/coverage/block_commands.pl
+++ b/tp/t/results/coverage/block_commands.pl
@@ -59,7 +59,6 @@ $result_trees{'block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -136,7 +135,6 @@ $result_trees{'block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -290,7 +288,6 @@ $result_trees{'block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/coverage/cartouche.pl 
b/tp/t/results/coverage/cartouche.pl
index 0ce86ee752..1213b59136 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -49,7 +49,6 @@ $result_trees{'cartouche'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'cartouche',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
diff --git a/tp/t/results/coverage/cartouche_in_example.pl 
b/tp/t/results/coverage/cartouche_in_example.pl
index 26081496d1..ab9a11ddc0 100644
--- a/tp/t/results/coverage/cartouche_in_example.pl
+++ b/tp/t/results/coverage/cartouche_in_example.pl
@@ -78,7 +78,6 @@ $result_trees{'cartouche_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'cartouche',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'cartouche'
                   },
@@ -130,7 +129,6 @@ $result_trees{'cartouche_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/coverage/cartouche_in_quotation.pl 
b/tp/t/results/coverage/cartouche_in_quotation.pl
index 59ddb5c0b4..36a700fcda 100644
--- a/tp/t/results/coverage/cartouche_in_quotation.pl
+++ b/tp/t/results/coverage/cartouche_in_quotation.pl
@@ -78,7 +78,6 @@ $result_trees{'cartouche_in_quotation'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'cartouche',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'cartouche'
                   },
@@ -130,7 +129,6 @@ $result_trees{'cartouche_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/coverage/commands_in_math.pl 
b/tp/t/results/coverage/commands_in_math.pl
index 85767c053f..62382586f8 100644
--- a/tp/t/results/coverage/commands_in_math.pl
+++ b/tp/t/results/coverage/commands_in_math.pl
@@ -177,7 +177,6 @@ $result_trees{'commands_in_math'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
@@ -1090,7 +1089,6 @@ $result_trees{'commands_in_math'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
@@ -1943,7 +1941,6 @@ $result_trees{'commands_in_math'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
@@ -2365,7 +2362,6 @@ $result_trees{'commands_in_math'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index f7a861997f..6805e21b15 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -69,7 +69,6 @@ $result_trees{'comment_on_cartouche_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'cartouche',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
diff --git a/tp/t/results/coverage/comment_on_group_line.pl 
b/tp/t/results/coverage/comment_on_group_line.pl
index 182482007c..f22af47e32 100644
--- a/tp/t/results/coverage/comment_on_group_line.pl
+++ b/tp/t/results/coverage/comment_on_group_line.pl
@@ -69,7 +69,6 @@ $result_trees{'comment_on_group_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 8166f5c009..98dde298a2 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -151,7 +151,6 @@ $result_trees{'def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -395,7 +394,6 @@ $result_trees{'def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -1927,7 +1925,6 @@ $result_trees{'def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/coverage/displaymath.pl 
b/tp/t/results/coverage/displaymath.pl
index 2f1146b278..76dce2662e 100644
--- a/tp/t/results/coverage/displaymath.pl
+++ b/tp/t/results/coverage/displaymath.pl
@@ -96,7 +96,6 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
@@ -255,7 +254,6 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
@@ -441,7 +439,6 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
@@ -536,7 +533,6 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
diff --git a/tp/t/results/coverage/exdent_and_commands.pl 
b/tp/t/results/coverage/exdent_and_commands.pl
index ddda75bb50..9db7f5d265 100644
--- a/tp/t/results/coverage/exdent_and_commands.pl
+++ b/tp/t/results/coverage/exdent_and_commands.pl
@@ -148,7 +148,6 @@ $result_trees{'exdent_and_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -315,7 +314,6 @@ $result_trees{'exdent_and_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/coverage/exdent_and_formats.pl 
b/tp/t/results/coverage/exdent_and_formats.pl
index 22c06fcb26..b0f03702ef 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -135,7 +135,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -280,7 +279,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -374,7 +372,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -502,7 +499,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -591,7 +587,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -716,7 +711,6 @@ $result_trees{'exdent_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -757,7 +751,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -846,7 +839,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -946,7 +938,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1046,7 +1037,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1163,7 +1153,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1280,7 +1269,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1380,7 +1368,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1497,7 +1484,6 @@ $result_trees{'exdent_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/coverage/flushleft_flushright.pl 
b/tp/t/results/coverage/flushleft_flushright.pl
index dbdcedfd49..84adf76ac2 100644
--- a/tp/t/results/coverage/flushleft_flushright.pl
+++ b/tp/t/results/coverage/flushleft_flushright.pl
@@ -86,7 +86,6 @@ $result_trees{'flushleft_flushright'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushleft',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushleft'
               },
@@ -185,7 +184,6 @@ $result_trees{'flushleft_flushright'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
diff --git a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl 
b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
index f85fe68909..e1a510b673 100644
--- a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
+++ b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
@@ -78,7 +78,6 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'flushleft',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'flushleft'
                   },
@@ -155,7 +154,6 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'flushright',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'flushright'
                   },
@@ -196,7 +194,6 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/coverage/flushright_example_nested.pl 
b/tp/t/results/coverage/flushright_example_nested.pl
index fb1b420d02..d2f9770d49 100644
--- a/tp/t/results/coverage/flushright_example_nested.pl
+++ b/tp/t/results/coverage/flushright_example_nested.pl
@@ -73,7 +73,6 @@ $result_trees{'flushright_example_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'flushright',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'flushright'
                   },
@@ -114,7 +113,6 @@ $result_trees{'flushright_example_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -211,7 +209,6 @@ $result_trees{'flushright_example_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -252,7 +249,6 @@ $result_trees{'flushright_example_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl 
b/tp/t/results/coverage/formats_only_title_comments.pl
index 10a62c4a78..20fa54ab23 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -84,7 +84,6 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -197,7 +196,6 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -307,7 +305,6 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -416,7 +413,6 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
@@ -543,7 +539,6 @@ $result_trees{'formats_only_title_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/coverage/formats_only_titles.pl 
b/tp/t/results/coverage/formats_only_titles.pl
index 6a72253907..1417e663e8 100644
--- a/tp/t/results/coverage/formats_only_titles.pl
+++ b/tp/t/results/coverage/formats_only_titles.pl
@@ -66,7 +66,6 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -145,7 +144,6 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -236,7 +234,6 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -328,7 +325,6 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
@@ -437,7 +433,6 @@ $result_trees{'formats_only_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index 9f67cbf6d6..15bd025835 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -92,7 +92,6 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -197,7 +196,6 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -328,7 +326,6 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -471,7 +468,6 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
@@ -646,7 +642,6 @@ $result_trees{'formats_titles'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 2ef5a269d3..df8f7d95cc 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
@@ -43,7 +43,6 @@ $result_trees{'group_beginning_and_end_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
diff --git a/tp/t/results/coverage/indentedblock.pl 
b/tp/t/results/coverage/indentedblock.pl
index 9f60a9baf8..56c5ec6093 100644
--- a/tp/t/results/coverage/indentedblock.pl
+++ b/tp/t/results/coverage/indentedblock.pl
@@ -75,7 +75,6 @@ $result_trees{'indentedblock'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'indentedblock',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'indentedblock'
               },
diff --git a/tp/t/results/coverage/insertcopying.pl 
b/tp/t/results/coverage/insertcopying.pl
index 96cab14f1f..3d263affde 100644
--- a/tp/t/results/coverage/insertcopying.pl
+++ b/tp/t/results/coverage/insertcopying.pl
@@ -84,7 +84,6 @@ $result_trees{'insertcopying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -125,7 +124,6 @@ $result_trees{'insertcopying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
diff --git a/tp/t/results/coverage/item_container.pl 
b/tp/t/results/coverage/item_container.pl
index fbf0c8d564..f583756e25 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -79,7 +79,6 @@ $result_trees{'item_container'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -192,7 +191,6 @@ $result_trees{'item_container'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -288,7 +286,6 @@ $result_trees{'item_container'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index 863080a129..51dfcced88 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -362,7 +362,6 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -517,7 +516,6 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/coverage/nested_block_commands.pl 
b/tp/t/results/coverage/nested_block_commands.pl
index 2530ffc9da..11ff2dcdf6 100644
--- a/tp/t/results/coverage/nested_block_commands.pl
+++ b/tp/t/results/coverage/nested_block_commands.pl
@@ -78,7 +78,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -119,7 +118,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -205,7 +203,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -246,7 +243,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -343,7 +339,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -395,7 +390,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -498,7 +492,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -539,7 +532,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -648,7 +640,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -689,7 +680,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -792,7 +782,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -833,7 +822,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -925,7 +913,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -966,7 +953,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -1064,7 +1050,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -1105,7 +1090,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -1197,7 +1181,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -1238,7 +1221,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -1324,7 +1306,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -1382,7 +1363,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -1468,7 +1448,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -1526,7 +1505,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -1612,7 +1590,6 @@ $result_trees{'nested_block_commands'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -1676,7 +1653,6 @@ $result_trees{'nested_block_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index 56a9b09521..725067900c 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -70,7 +70,6 @@ $result_trees{'preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -231,7 +230,6 @@ $result_trees{'preformatted'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'vtable',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'vtable'
                   },
@@ -274,7 +272,6 @@ $result_trees{'preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'format',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl 
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index dd28ed8389..d778041e42 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -171,7 +171,6 @@ $result_trees{'punctuation_in_line_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -278,7 +277,6 @@ $result_trees{'punctuation_in_line_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -403,7 +401,6 @@ $result_trees{'punctuation_in_line_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -540,7 +537,6 @@ $result_trees{'punctuation_in_line_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/coverage/quotation_author.pl 
b/tp/t/results/coverage/quotation_author.pl
index 6de4242242..815013b793 100644
--- a/tp/t/results/coverage/quotation_author.pl
+++ b/tp/t/results/coverage/quotation_author.pl
@@ -154,7 +154,6 @@ $result_trees{'quotation_author'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/coverage/raggedright.pl 
b/tp/t/results/coverage/raggedright.pl
index fdedbf5aef..308f56d92f 100644
--- a/tp/t/results/coverage/raggedright.pl
+++ b/tp/t/results/coverage/raggedright.pl
@@ -59,7 +59,6 @@ $result_trees{'raggedright'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'raggedright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'raggedright'
               },
diff --git a/tp/t/results/coverage/symbol_after_block.pl 
b/tp/t/results/coverage/symbol_after_block.pl
index 7a690e62b7..7b768a42ac 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -53,7 +53,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html. On the line.'
               },
@@ -133,7 +132,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html@ On the line.'
               },
@@ -387,7 +385,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table+'
               },
@@ -523,7 +520,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table@'
               },
@@ -641,7 +637,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize\'\''
               },
@@ -746,7 +741,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize@'
               },
@@ -987,7 +981,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable^'
               },
@@ -1216,7 +1209,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable{'
               },
@@ -1308,7 +1300,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushleft',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushleft!'
               },
@@ -1384,7 +1375,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushleft',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushleft@'
               },
@@ -1473,7 +1463,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying*'
               },
@@ -1549,7 +1538,6 @@ $result_trees{'symbol_after_block'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying@'
               },
diff --git a/tp/t/results/coverage/symbol_after_command.pl 
b/tp/t/results/coverage/symbol_after_command.pl
index c80fea3388..22f88e59b3 100644
--- a/tp/t/results/coverage/symbol_after_command.pl
+++ b/tp/t/results/coverage/symbol_after_command.pl
@@ -329,7 +329,6 @@ $result_trees{'symbol_after_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index e0c39a7d48..e5d428976b 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -151,7 +151,6 @@ $result_trees{'table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -495,7 +494,6 @@ $result_trees{'table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
@@ -610,7 +608,6 @@ $result_trees{'table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/coverage/table_command_comment.pl 
b/tp/t/results/coverage/table_command_comment.pl
index 343fc2d606..dbec0ac212 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -106,7 +106,6 @@ $result_trees{'table_command_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/coverage_braces/caption_not_closed.pl 
b/tp/t/results/coverage_braces/caption_not_closed.pl
index 1ae394b07b..1e67143c6e 100644
--- a/tp/t/results/coverage_braces/caption_not_closed.pl
+++ b/tp/t/results/coverage_braces/caption_not_closed.pl
@@ -129,7 +129,6 @@ $result_trees{'caption_not_closed'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 02ff622210..01ccfbba0d 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
@@ -63,7 +63,6 @@ $result_trees{'format_on_first_footnote_line'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'quotation',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'quotation'
                           },
@@ -168,7 +167,6 @@ $result_trees{'format_on_first_footnote_line'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
diff --git a/tp/t/results/coverage_braces/kbd.pl 
b/tp/t/results/coverage_braces/kbd.pl
index b2dcdb896b..bc165aec4a 100644
--- a/tp/t/results/coverage_braces/kbd.pl
+++ b/tp/t/results/coverage_braces/kbd.pl
@@ -278,7 +278,6 @@ $result_trees{'kbd'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -402,7 +401,6 @@ $result_trees{'kbd'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'format',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index e86008eb4c..52f98ee77b 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -628,7 +628,6 @@ $result_trees{'test_image'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
@@ -1794,7 +1793,6 @@ $result_trees{'test_image'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2938,7 +2936,6 @@ $result_trees{'test_image'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 9ffdc85837..b6e564c1eb 100644
--- a/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
+++ b/tp/t/results/coverage_braces/two_footnotes_in_nodes.pl
@@ -306,7 +306,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 959f50c8bb..5e4c157fda 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
@@ -338,7 +338,6 @@ $result_trees{'two_footnotes_in_nodes_separate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index c67a3f97ad..11f337f879 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -119,7 +119,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
@@ -273,7 +272,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -412,7 +410,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -582,7 +579,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -737,7 +733,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -929,7 +924,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -1106,7 +1100,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -1261,7 +1254,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
@@ -1416,7 +1408,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -1586,7 +1577,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -1763,7 +1753,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -1955,7 +1944,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -2131,7 +2119,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -2292,7 +2279,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -2446,7 +2432,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -2606,7 +2591,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
@@ -2766,7 +2750,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defmac',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defmac'
               },
@@ -2926,7 +2909,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defspec',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
@@ -3071,7 +3053,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
@@ -3246,7 +3227,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
@@ -3391,7 +3371,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defopt',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defopt'
               },
@@ -3567,7 +3546,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
@@ -3728,7 +3706,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevar'
               },
@@ -3895,7 +3872,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -4078,7 +4054,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeivar'
               },
@@ -4260,7 +4235,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defmethod',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defmethod'
               },
@@ -4458,7 +4432,6 @@ $result_trees{'all_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypemethod',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypemethod'
               },
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index 0774279a94..689de876ff 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -475,7 +475,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -919,7 +918,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
@@ -1188,7 +1186,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -1759,7 +1756,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -1934,7 +1930,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -2288,7 +2283,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -2707,7 +2701,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
@@ -3140,7 +3133,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -3559,7 +3551,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -4018,7 +4009,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -4432,7 +4422,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -4880,7 +4869,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -5088,7 +5076,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -5318,7 +5305,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -5548,7 +5534,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -5756,7 +5741,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -5964,7 +5948,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -6194,7 +6177,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -6424,7 +6406,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -6632,7 +6613,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -6840,7 +6820,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -7070,7 +7049,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -7300,7 +7278,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -7508,7 +7485,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -7716,7 +7692,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -7965,7 +7940,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -8138,7 +8112,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
@@ -8362,7 +8335,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -8586,7 +8558,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -8810,7 +8781,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
@@ -9034,7 +9004,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
@@ -9292,7 +9261,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -9550,7 +9518,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -9808,7 +9775,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
@@ -10066,7 +10032,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
@@ -10290,7 +10255,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -10514,7 +10478,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -10772,7 +10735,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -11029,7 +10991,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -11327,7 +11288,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -11625,7 +11585,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -11889,7 +11848,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -12153,7 +12111,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -12451,7 +12408,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -12749,7 +12705,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -13052,7 +13007,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -13355,7 +13309,6 @@ $result_trees{'all_commands_delimiters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 7d1d149ff2..750b6f9c81 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -498,7 +498,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -943,7 +942,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
@@ -1213,7 +1211,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -1785,7 +1782,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -1961,7 +1957,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -2316,7 +2311,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -2736,7 +2730,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
@@ -3170,7 +3163,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -3590,7 +3582,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -4050,7 +4041,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -4465,7 +4455,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -4914,7 +4903,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -5123,7 +5111,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -5354,7 +5341,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -5585,7 +5571,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -5794,7 +5779,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -6003,7 +5987,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -6234,7 +6217,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -6465,7 +6447,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -6674,7 +6655,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -6883,7 +6863,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -7114,7 +7093,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -7345,7 +7323,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -7554,7 +7531,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -7763,7 +7739,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -8013,7 +7988,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -8187,7 +8161,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
@@ -8412,7 +8385,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -8637,7 +8609,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -8862,7 +8833,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
@@ -9087,7 +9057,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
@@ -9346,7 +9315,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -9605,7 +9573,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -9864,7 +9831,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
@@ -10123,7 +10089,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
@@ -10348,7 +10313,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -10573,7 +10537,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -10832,7 +10795,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -11090,7 +11052,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -11389,7 +11350,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -11688,7 +11648,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -11953,7 +11912,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -12218,7 +12176,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -12517,7 +12474,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -12816,7 +12772,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -13120,7 +13075,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -13424,7 +13378,6 @@ $result_trees{'all_commands_delimiters_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index d91a1b434b..44ea68a06b 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -142,7 +142,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
@@ -297,7 +296,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -437,7 +435,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -608,7 +605,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -764,7 +760,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -957,7 +952,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -1135,7 +1129,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -1291,7 +1284,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
@@ -1447,7 +1439,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -1618,7 +1609,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -1796,7 +1786,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -1989,7 +1978,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -2166,7 +2154,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -2328,7 +2315,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -2483,7 +2469,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
@@ -2644,7 +2629,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
@@ -2805,7 +2789,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defmac',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defmac'
               },
@@ -2966,7 +2949,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defspec',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defspec'
               },
@@ -3112,7 +3094,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
@@ -3288,7 +3269,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
@@ -3434,7 +3414,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defopt',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defopt'
               },
@@ -3611,7 +3590,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
@@ -3773,7 +3751,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevar'
               },
@@ -3941,7 +3918,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -4125,7 +4101,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeivar'
               },
@@ -4308,7 +4283,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defmethod',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defmethod'
               },
@@ -4507,7 +4481,6 @@ $result_trees{'all_commands_printindex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypemethod',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypemethod'
               },
diff --git a/tp/t/results/def/all_empty_def.pl 
b/tp/t/results/def/all_empty_def.pl
index 8a57d31a74..6e19ddbca1 100644
--- a/tp/t/results/def/all_empty_def.pl
+++ b/tp/t/results/def/all_empty_def.pl
@@ -51,7 +51,6 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -123,7 +122,6 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
@@ -195,7 +193,6 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
@@ -267,7 +264,6 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
@@ -339,7 +335,6 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypevr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypevr'
               },
@@ -411,7 +406,6 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defcv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defcv'
               },
@@ -483,7 +477,6 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypecv',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypecv'
               },
@@ -555,7 +548,6 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
@@ -627,7 +619,6 @@ $result_trees{'all_empty_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftp',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftp'
               },
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index 0ce1d43376..aeb77a9234 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -188,7 +188,6 @@ $result_trees{'ampchar'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defop'
               },
diff --git a/tp/t/results/def/code_in_def.pl b/tp/t/results/def/code_in_def.pl
index 6c6ed2eb71..1b48a5d74d 100644
--- a/tp/t/results/def/code_in_def.pl
+++ b/tp/t/results/def/code_in_def.pl
@@ -229,7 +229,6 @@ $result_trees{'code_in_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefn'
               },
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index 70bd8a6af9..dee4fdc07b 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -380,7 +380,6 @@ $result_trees{'def_defx_mismatch'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index 62897698c3..ea42a0247c 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -269,7 +269,6 @@ $result_trees{'defx_after_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 f7d917f49f..fb1bbb226f 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -293,7 +293,6 @@ $result_trees{'defx_after_comment_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'deffn',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
@@ -335,7 +334,6 @@ $result_trees{'defx_after_comment_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index 4cf58ee017..27a562a43a 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -257,7 +257,6 @@ $result_trees{'defx_after_empty_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 91fb31f62f..bfd645a1ef 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
@@ -323,7 +323,6 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'deffn',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
@@ -365,7 +364,6 @@ $result_trees{'defx_after_empty_line_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index 644b807fcd..d2732794c0 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -269,7 +269,6 @@ $result_trees{'defx_after_paragraph_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 b0d14b2be9..31051d2003 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -287,7 +287,6 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'deffn',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
@@ -329,7 +328,6 @@ $result_trees{'defx_after_preformatted_with_text'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index b6f987f5c1..aec0ac5021 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -263,7 +263,6 @@ $result_trees{'defx_after_text'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index 3cab9a2302..60315621d2 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -263,7 +263,6 @@ $result_trees{'defx_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'deffn',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
@@ -305,7 +304,6 @@ $result_trees{'defx_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/def/double_command.pl 
b/tp/t/results/def/double_command.pl
index 143f74909c..81609fe1fb 100644
--- a/tp/t/results/def/double_command.pl
+++ b/tp/t/results/def/double_command.pl
@@ -416,7 +416,6 @@ $result_trees{'double_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -655,7 +654,6 @@ $result_trees{'double_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index a27ea77628..824018be47 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -614,7 +614,6 @@ $result_trees{'empty_def_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/def/empty_def_command.pl 
b/tp/t/results/def/empty_def_command.pl
index 6b979832de..22317de60f 100644
--- a/tp/t/results/def/empty_def_command.pl
+++ b/tp/t/results/def/empty_def_command.pl
@@ -102,7 +102,6 @@ $result_trees{'empty_def_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -327,7 +326,6 @@ $result_trees{'empty_def_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index 6631e012c4..dbda77dae9 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -208,7 +208,6 @@ $result_trees{'empty_deftype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
@@ -414,7 +413,6 @@ $result_trees{'empty_deftype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
@@ -664,7 +662,6 @@ $result_trees{'empty_deftype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypemethod',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypemethod'
               },
@@ -892,7 +889,6 @@ $result_trees{'empty_deftype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defmethod',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defmethod'
               },
diff --git a/tp/t/results/def/empty_deftypeop_name.pl 
b/tp/t/results/def/empty_deftypeop_name.pl
index 85f252391e..65739839e1 100644
--- a/tp/t/results/def/empty_deftypeop_name.pl
+++ b/tp/t/results/def/empty_deftypeop_name.pl
@@ -192,7 +192,6 @@ $result_trees{'empty_deftypeop_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypeop',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypeop'
               },
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index 8f24cf2ad9..7fa389ea0a 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -261,7 +261,6 @@ $result_trees{'end_of_lines_protected'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 10087bcf3f..7ac210bd2d 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
@@ -282,7 +282,6 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'deffn',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'deffn'
                           },
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 845e8eca02..5d6b003de8 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -527,7 +527,6 @@ $result_trees{'inter_item_commands_in_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 9132144506..3157a845a7 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
@@ -553,7 +553,6 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'deffn',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
@@ -595,7 +594,6 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 5af6e9c2c7..4c2dcabd30 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -129,7 +129,6 @@ $result_trees{'leading_space_in_def_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 14df950c70..60aefe05a5 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -68,7 +68,6 @@ $result_trees{'no_category_or_no_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -188,7 +187,6 @@ $result_trees{'no_category_or_no_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -422,7 +420,6 @@ $result_trees{'no_category_or_no_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 1d4bde6944..016ebe0a3d 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -399,7 +399,6 @@ $result_trees{'omit_def_space'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
diff --git a/tp/t/results/def/protected_brace.pl 
b/tp/t/results/def/protected_brace.pl
index f05a8bea8a..c5a1141592 100644
--- a/tp/t/results/def/protected_brace.pl
+++ b/tp/t/results/def/protected_brace.pl
@@ -102,7 +102,6 @@ $result_trees{'protected_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 602e494e02..527de82937 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -622,7 +622,6 @@ $result_trees{'ref_in_def'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 5304c19742..8dbfb34420 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -311,7 +311,6 @@ $result_trees{'space_in_def_for_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/def/wrong_braces_simple.pl 
b/tp/t/results/def/wrong_braces_simple.pl
index f105537d68..65c176cb26 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -147,7 +147,6 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -329,7 +328,6 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -510,7 +508,6 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -697,7 +694,6 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -1385,7 +1381,6 @@ $result_trees{'wrong_braces_simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 8bba6dd24a..21a0c19c3e 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
@@ -162,7 +162,6 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -354,7 +353,6 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 0fdc73ecb0..37f8a10143 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
@@ -47,7 +47,6 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -120,7 +119,6 @@ 
$result_trees{'empty_quotation_with_arg_followed_by_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl 
b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
index 7544e930e6..cb2b9696be 100644
--- a/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
+++ b/tp/t/results/docbook_tests/special_docbook_unnumbered.pl
@@ -356,7 +356,6 @@ $result_trees{'special_docbook_unnumbered'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/float/anchor_in_caption.pl 
b/tp/t/results/float/anchor_in_caption.pl
index 31b3540925..ab4b65f5f2 100644
--- a/tp/t/results/float/anchor_in_caption.pl
+++ b/tp/t/results/float/anchor_in_caption.pl
@@ -207,7 +207,6 @@ $result_trees{'anchor_in_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/cindex_in_caption.pl 
b/tp/t/results/float/cindex_in_caption.pl
index 0a00a12ad6..1a382016c2 100644
--- a/tp/t/results/float/cindex_in_caption.pl
+++ b/tp/t/results/float/cindex_in_caption.pl
@@ -221,7 +221,6 @@ $result_trees{'cindex_in_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 1dec691dc2..0127fb2efa 100644
--- a/tp/t/results/float/comment_space_comand_in_float.pl
+++ b/tp/t/results/float/comment_space_comand_in_float.pl
@@ -127,7 +127,6 @@ $result_trees{'comment_space_comand_in_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index d651ee30a4..3827fc8aa1 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -236,7 +236,6 @@ $result_trees{'complex_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -527,7 +526,6 @@ $result_trees{'complex_float'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -644,7 +642,6 @@ $result_trees{'complex_float'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -1127,7 +1124,6 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1308,7 +1304,6 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'table',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'table'
                           },
@@ -1533,7 +1528,6 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'multitable',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'multitable'
                           },
@@ -1716,7 +1710,6 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'itemize',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'itemize'
                           },
@@ -2448,7 +2441,6 @@ $result_trees{'complex_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -2705,7 +2697,6 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -2846,7 +2837,6 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'table',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'table'
                           },
@@ -3071,7 +3061,6 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'multitable',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'multitable'
                           },
@@ -3254,7 +3243,6 @@ $result_trees{'complex_float'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'itemize',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'itemize'
                           },
@@ -3734,7 +3722,6 @@ $result_trees{'complex_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/empty_caption.pl 
b/tp/t/results/float/empty_caption.pl
index cf075171a4..c1463038c8 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -100,7 +100,6 @@ $result_trees{'empty_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -221,7 +220,6 @@ $result_trees{'empty_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -354,7 +352,6 @@ $result_trees{'empty_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/empty_label_no_space.pl 
b/tp/t/results/float/empty_label_no_space.pl
index eaa43813a7..a348b4679f 100644
--- a/tp/t/results/float/empty_label_no_space.pl
+++ b/tp/t/results/float/empty_label_no_space.pl
@@ -57,7 +57,6 @@ $result_trees{'empty_label_no_space'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 92aee9c8eb..7417451404 100644
--- a/tp/t/results/float/empty_label_no_space_comment.pl
+++ b/tp/t/results/float/empty_label_no_space_comment.pl
@@ -73,7 +73,6 @@ $result_trees{'empty_label_no_space_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/empty_label_with_space.pl 
b/tp/t/results/float/empty_label_with_space.pl
index 25a48dda8e..887645afa0 100644
--- a/tp/t/results/float/empty_label_with_space.pl
+++ b/tp/t/results/float/empty_label_with_space.pl
@@ -57,7 +57,6 @@ $result_trees{'empty_label_with_space'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 dd9d9c8c42..f55feae7fc 100644
--- a/tp/t/results/float/empty_label_with_space_comment.pl
+++ b/tp/t/results/float/empty_label_with_space_comment.pl
@@ -74,7 +74,6 @@ $result_trees{'empty_label_with_space_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/empty_listoffloats_with_floats.pl 
b/tp/t/results/float/empty_listoffloats_with_floats.pl
index e74204de02..1adb8b93ed 100644
--- a/tp/t/results/float/empty_listoffloats_with_floats.pl
+++ b/tp/t/results/float/empty_listoffloats_with_floats.pl
@@ -81,7 +81,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -208,7 +207,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -289,7 +287,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -400,7 +397,6 @@ $result_trees{'empty_listoffloats_with_floats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index b894a78bff..eb6cec735e 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -532,7 +532,6 @@ $result_trees{'float_copying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'float',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'float'
                       },
@@ -585,7 +584,6 @@ $result_trees{'float_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -800,7 +798,6 @@ $result_trees{'float_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/float/float_with_at_commands.pl 
b/tp/t/results/float/float_with_at_commands.pl
index a3b91fd4d8..17f7e9aa78 100644
--- a/tp/t/results/float/float_with_at_commands.pl
+++ b/tp/t/results/float/float_with_at_commands.pl
@@ -304,7 +304,6 @@ $result_trees{'float_with_at_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/footnote_in_caption.pl 
b/tp/t/results/float/footnote_in_caption.pl
index 4cc6a4aaf8..e7456debce 100644
--- a/tp/t/results/float/footnote_in_caption.pl
+++ b/tp/t/results/float/footnote_in_caption.pl
@@ -207,7 +207,6 @@ $result_trees{'footnote_in_caption'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 4ce7d392b2..e5d53cec8d 100644
--- a/tp/t/results/float/footnote_in_caption_and_error.pl
+++ b/tp/t/results/float/footnote_in_caption_and_error.pl
@@ -217,7 +217,6 @@ $result_trees{'footnote_in_caption_and_error'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/numbering_captions_listoffloats.pl 
b/tp/t/results/float/numbering_captions_listoffloats.pl
index dffd365e2a..8f2a8c5ba6 100644
--- a/tp/t/results/float/numbering_captions_listoffloats.pl
+++ b/tp/t/results/float/numbering_captions_listoffloats.pl
@@ -246,7 +246,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -415,7 +414,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -585,7 +583,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -690,7 +687,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -783,7 +779,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -931,7 +926,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -1097,7 +1091,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -1274,7 +1267,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -1634,7 +1626,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1841,7 +1832,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -1985,7 +1975,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -2284,7 +2273,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -2461,7 +2449,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -2638,7 +2625,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -2770,7 +2756,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -2947,7 +2932,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -3154,7 +3138,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -3308,7 +3291,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -3476,7 +3458,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -3736,7 +3717,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -3945,7 +3925,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -4099,7 +4078,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -4350,7 +4328,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -4524,7 +4501,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -4778,7 +4754,6 @@ $result_trees{'numbering_captions_listoffloats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/ref_to_float.pl 
b/tp/t/results/float/ref_to_float.pl
index 6dd6295052..07930751a2 100644
--- a/tp/t/results/float/ref_to_float.pl
+++ b/tp/t/results/float/ref_to_float.pl
@@ -74,7 +74,6 @@ $result_trees{'ref_to_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -168,7 +167,6 @@ $result_trees{'ref_to_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/float/simple.pl b/tp/t/results/float/simple.pl
index 1ea3971726..9804f2c26f 100644
--- a/tp/t/results/float/simple.pl
+++ b/tp/t/results/float/simple.pl
@@ -112,7 +112,6 @@ $result_trees{'simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 61e406d1b7..3650499f20 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -4735,7 +4735,6 @@ $result_trees{'at_commands_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 84bc6d9d28..627ac5a1ec 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
@@ -4802,7 +4802,6 @@ $result_trees{'at_commands_in_refs_latin1'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 fb2fe0bd1c..18dfc9ea4e 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
@@ -4802,7 +4802,6 @@ $result_trees{'at_commands_in_refs_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 0491c0153c..fce4e569a4 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
@@ -499,7 +499,6 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 51f901a633..c2929ac7ff 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
@@ -537,7 +537,6 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 c87c997a10..0dfacbbd90 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
@@ -409,7 +409,6 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 0b2d3e5dc6..ca274b765d 100644
--- a/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
+++ b/tp/t/results/formats_encodings/documentencoding_utf8_and_insertions.pl
@@ -211,7 +211,6 @@ $result_trees{'documentencoding_utf8_and_insertions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl 
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index 1e528fff06..c6bb040c43 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -390,7 +390,6 @@ $result_trees{'japanese_shift_jis'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
@@ -588,7 +587,6 @@ $result_trees{'japanese_shift_jis'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 411fa0fa0b..968533369c 100644
--- a/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
+++ b/tp/t/results/formats_encodings/no_documentencoding_and_insertions.pl
@@ -180,7 +180,6 @@ $result_trees{'no_documentencoding_and_insertions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index e99698361b..b65736c3ca 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -225,7 +225,6 @@ $result_trees{'sample_utf8'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -372,7 +371,6 @@ $result_trees{'sample_utf8'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
@@ -747,7 +745,6 @@ $result_trees{'sample_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1163,7 +1160,6 @@ $result_trees{'sample_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 702d14c4a5..a2dca65c13 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -141,7 +141,6 @@ $result_trees{'cond'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -260,7 +259,6 @@ $result_trees{'cond'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl 
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 86a21c2200..9f1c130bf4 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -141,7 +141,6 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -271,7 +270,6 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
diff --git a/tp/t/results/formatting/cond_info.pl 
b/tp/t/results/formatting/cond_info.pl
index dcf73c8299..d5b229a351 100644
--- a/tp/t/results/formatting/cond_info.pl
+++ b/tp/t/results/formatting/cond_info.pl
@@ -130,7 +130,6 @@ $result_trees{'cond_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -244,7 +243,6 @@ $result_trees{'cond_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
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 cb5ae2c266..93b4de24a6 100644
--- a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
@@ -141,7 +141,6 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -271,7 +270,6 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
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 d4ea055981..48d7ff7d24 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
@@ -130,7 +130,6 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -244,7 +243,6 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
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 1d9d2cfff2..2ae2740222 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
@@ -130,7 +130,6 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -244,7 +243,6 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
diff --git a/tp/t/results/formatting/cond_xml.pl 
b/tp/t/results/formatting/cond_xml.pl
index 61ec7fcbc6..76697dc3df 100644
--- a/tp/t/results/formatting/cond_xml.pl
+++ b/tp/t/results/formatting/cond_xml.pl
@@ -130,7 +130,6 @@ $result_trees{'cond_xml'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -244,7 +243,6 @@ $result_trees{'cond_xml'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
diff --git a/tp/t/results/formatting/defcondx_Dbar.pl 
b/tp/t/results/formatting/defcondx_Dbar.pl
index 8bebf4a097..0c68f9779a 100644
--- a/tp/t/results/formatting/defcondx_Dbar.pl
+++ b/tp/t/results/formatting/defcondx_Dbar.pl
@@ -273,7 +273,6 @@ $result_trees{'defcondx_Dbar'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/formatting/defcondx_Ubar.pl 
b/tp/t/results/formatting/defcondx_Ubar.pl
index ea7034d4e3..00e25f2f39 100644
--- a/tp/t/results/formatting/defcondx_Ubar.pl
+++ b/tp/t/results/formatting/defcondx_Ubar.pl
@@ -225,7 +225,6 @@ $result_trees{'defcondx_Ubar'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/formatting/direntry_dircategory_info_split.pl 
b/tp/t/results/formatting/direntry_dircategory_info_split.pl
index bcc2e02999..60aaac7c87 100644
--- a/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -267,7 +267,6 @@ $result_trees{'direntry_dircategory_info_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'direntry',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
@@ -447,7 +446,6 @@ $result_trees{'direntry_dircategory_info_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'direntry',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
@@ -703,7 +701,6 @@ $result_trees{'direntry_dircategory_info_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'direntry',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
@@ -821,7 +818,6 @@ $result_trees{'direntry_dircategory_info_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/formatting/float_copying.pl 
b/tp/t/results/formatting/float_copying.pl
index e3580612b5..fb87fc6576 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -591,7 +591,6 @@ $result_trees{'float_copying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'float',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'float'
                       },
@@ -644,7 +643,6 @@ $result_trees{'float_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -1010,7 +1008,6 @@ $result_trees{'float_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/formatting/split_nocopying.pl 
b/tp/t/results/formatting/split_nocopying.pl
index a1d4af7475..9de9217b64 100644
--- a/tp/t/results/formatting/split_nocopying.pl
+++ b/tp/t/results/formatting/split_nocopying.pl
@@ -245,7 +245,6 @@ $result_trees{'split_nocopying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/formatting/split_nocopying_split.pl 
b/tp/t/results/formatting/split_nocopying_split.pl
index 5f12c4eba5..126e89bc89 100644
--- a/tp/t/results/formatting/split_nocopying_split.pl
+++ b/tp/t/results/formatting/split_nocopying_split.pl
@@ -245,7 +245,6 @@ $result_trees{'split_nocopying_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index 1e05897462..ae0396d314 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -3981,7 +3981,6 @@ $result_trees{'texi_bib_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -4423,7 +4422,6 @@ $result_trees{'texi_bib_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/formatting/texi_cond.pl 
b/tp/t/results/formatting/texi_cond.pl
index ea95ad5ca7..21b9af9b45 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -141,7 +141,6 @@ $result_trees{'texi_cond'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -260,7 +259,6 @@ $result_trees{'texi_cond'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index fa52c49120..9ff2b3724d 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -505,7 +505,6 @@ $result_trees{'texi_glossary'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/heading/heading_in_copying.pl 
b/tp/t/results/heading/heading_in_copying.pl
index 8cbaec4466..a9bb5aed18 100644
--- a/tp/t/results/heading/heading_in_copying.pl
+++ b/tp/t/results/heading/heading_in_copying.pl
@@ -211,7 +211,6 @@ $result_trees{'heading_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
diff --git a/tp/t/results/heading/heading_in_example.pl 
b/tp/t/results/heading/heading_in_example.pl
index 5e1901df8f..a7ee363e48 100644
--- a/tp/t/results/heading/heading_in_example.pl
+++ b/tp/t/results/heading/heading_in_example.pl
@@ -100,7 +100,6 @@ $result_trees{'heading_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/heading/heading_in_quotation.pl 
b/tp/t/results/heading/heading_in_quotation.pl
index f74b9c6ee8..5e40f61060 100644
--- a/tp/t/results/heading/heading_in_quotation.pl
+++ b/tp/t/results/heading/heading_in_quotation.pl
@@ -112,7 +112,6 @@ $result_trees{'heading_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/html_tests/check_htmlxref.pl 
b/tp/t/results/html_tests/check_htmlxref.pl
index f40c5208bd..f0985f9a58 100644
--- a/tp/t/results/html_tests/check_htmlxref.pl
+++ b/tp/t/results/html_tests/check_htmlxref.pl
@@ -523,7 +523,6 @@ $result_trees{'check_htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 cb4672da97..db26cc0f19 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
@@ -523,7 +523,6 @@ $result_trees{'check_htmlxref_ignore_ref_top_up'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/html_tests/check_htmlxref_menu.pl 
b/tp/t/results/html_tests/check_htmlxref_menu.pl
index 594acc73b1..e593952c9b 100644
--- a/tp/t/results/html_tests/check_htmlxref_menu.pl
+++ b/tp/t/results/html_tests/check_htmlxref_menu.pl
@@ -523,7 +523,6 @@ $result_trees{'check_htmlxref_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 46b7e57d78..9bfafb2965 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
@@ -523,7 +523,6 @@ $result_trees{'check_htmlxref_no_use_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/html_tests/commands_in_abbr.pl 
b/tp/t/results/html_tests/commands_in_abbr.pl
index 1d532de031..29b871f7d6 100644
--- a/tp/t/results/html_tests/commands_in_abbr.pl
+++ b/tp/t/results/html_tests/commands_in_abbr.pl
@@ -184,7 +184,6 @@ $result_trees{'commands_in_abbr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/html_tests/commands_in_alt.pl 
b/tp/t/results/html_tests/commands_in_alt.pl
index a0806f564b..0c39760c2b 100644
--- a/tp/t/results/html_tests/commands_in_alt.pl
+++ b/tp/t/results/html_tests/commands_in_alt.pl
@@ -198,7 +198,6 @@ $result_trees{'commands_in_alt'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
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 da6a286d76..44623ebd98 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -171,7 +171,6 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'deftypefun',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'deftypefun'
                   },
@@ -213,7 +212,6 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
@@ -542,7 +540,6 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
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 0eafc10a49..37b2894827 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -214,7 +214,6 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'deftypefun',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'deftypefun'
                   },
@@ -256,7 +255,6 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
@@ -502,7 +500,6 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deftypefun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deftypefun'
               },
diff --git a/tp/t/results/html_tests/documentdescription.pl 
b/tp/t/results/html_tests/documentdescription.pl
index 993ba121e3..c29b58c30a 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -264,7 +264,6 @@ $result_trees{'documentdescription'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'documentdescription',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 7bd2c930e0..67a0c8fbc4 100644
--- a/tp/t/results/html_tests/example_at_commands_arguments.pl
+++ b/tp/t/results/html_tests/example_at_commands_arguments.pl
@@ -222,7 +222,6 @@ $result_trees{'example_at_commands_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/html_tests/example_class.pl 
b/tp/t/results/html_tests/example_class.pl
index 55417465c7..d65ce040f1 100644
--- a/tp/t/results/html_tests/example_class.pl
+++ b/tp/t/results/html_tests/example_class.pl
@@ -145,7 +145,6 @@ $result_trees{'example_class'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/html_tests/example_empty_arguments.pl 
b/tp/t/results/html_tests/example_empty_arguments.pl
index b7c0f4876c..0c51e6a8d8 100644
--- a/tp/t/results/html_tests/example_empty_arguments.pl
+++ b/tp/t/results/html_tests/example_empty_arguments.pl
@@ -83,7 +83,6 @@ $result_trees{'example_empty_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -192,7 +191,6 @@ $result_trees{'example_empty_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -300,7 +298,6 @@ $result_trees{'example_empty_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/html_tests/example_multi_class.pl 
b/tp/t/results/html_tests/example_multi_class.pl
index eb386c72b6..854b3c3916 100644
--- a/tp/t/results/html_tests/example_multi_class.pl
+++ b/tp/t/results/html_tests/example_multi_class.pl
@@ -223,7 +223,6 @@ $result_trees{'example_multi_class'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/html_tests/html_in_copying.pl 
b/tp/t/results/html_tests/html_in_copying.pl
index 087c01310a..dd2fffc701 100644
--- a/tp/t/results/html_tests/html_in_copying.pl
+++ b/tp/t/results/html_tests/html_in_copying.pl
@@ -90,7 +90,6 @@ $result_trees{'html_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'html',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
@@ -131,7 +130,6 @@ $result_trees{'html_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
diff --git a/tp/t/results/html_tests/itemize_arguments.pl 
b/tp/t/results/html_tests/itemize_arguments.pl
index aba61d1e00..f7bcf9204a 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -79,7 +79,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -172,7 +171,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -309,7 +307,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -402,7 +399,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -495,7 +491,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -588,7 +583,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -709,7 +703,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -915,7 +908,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1043,7 +1035,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1175,7 +1166,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1275,7 +1265,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1407,7 +1396,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1508,7 +1496,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1609,7 +1596,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1737,7 +1723,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1869,7 +1854,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1997,7 +1981,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -2129,7 +2112,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -2342,7 +2324,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -2555,7 +2536,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -2956,7 +2936,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -3357,7 +3336,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -3734,7 +3712,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -3855,7 +3832,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -3990,7 +3966,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4128,7 +4103,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4291,7 +4265,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4429,7 +4402,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4557,7 +4529,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4689,7 +4660,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4846,7 +4816,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4978,7 +4947,6 @@ $result_trees{'itemize_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
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 87f9d0a3ea..32f69a8129 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -79,7 +79,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -172,7 +171,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -309,7 +307,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -402,7 +399,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -495,7 +491,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -588,7 +583,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -709,7 +703,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -915,7 +908,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1043,7 +1035,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1175,7 +1166,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1275,7 +1265,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1407,7 +1396,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1508,7 +1496,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1609,7 +1596,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1737,7 +1723,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1869,7 +1854,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1997,7 +1981,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -2129,7 +2112,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -2342,7 +2324,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -2555,7 +2536,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -2956,7 +2936,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -3357,7 +3336,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -3734,7 +3712,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -3855,7 +3832,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -3990,7 +3966,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4128,7 +4103,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4291,7 +4265,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4429,7 +4402,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4557,7 +4529,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4689,7 +4660,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4846,7 +4816,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -4978,7 +4947,6 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/html_tests/mathjax_with_texinfo.pl 
b/tp/t/results/html_tests/mathjax_with_texinfo.pl
index 32a86ea488..653006960d 100644
--- a/tp/t/results/html_tests/mathjax_with_texinfo.pl
+++ b/tp/t/results/html_tests/mathjax_with_texinfo.pl
@@ -146,7 +146,6 @@ $result_trees{'mathjax_with_texinfo'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
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 e64173121f..6536311028 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
@@ -151,7 +151,6 @@ $result_trees{'mathjax_with_texinfo_enable_encoding'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
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 7d9912f5ac..595a780dd6 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
@@ -146,7 +146,6 @@ $result_trees{'mathjax_with_texinfo_no_convert_to_latex'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
diff --git a/tp/t/results/html_tests/raw_html.pl 
b/tp/t/results/html_tests/raw_html.pl
index ba8d70e493..1cbc298edf 100644
--- a/tp/t/results/html_tests/raw_html.pl
+++ b/tp/t/results/html_tests/raw_html.pl
@@ -53,7 +53,6 @@ $result_trees{'raw_html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
diff --git a/tp/t/results/html_tests/redirection_same_labels.pl 
b/tp/t/results/html_tests/redirection_same_labels.pl
index eb5c942946..3092ea6757 100644
--- a/tp/t/results/html_tests/redirection_same_labels.pl
+++ b/tp/t/results/html_tests/redirection_same_labels.pl
@@ -292,7 +292,6 @@ $result_trees{'redirection_same_labels'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -598,7 +597,6 @@ $result_trees{'redirection_same_labels'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -961,7 +959,6 @@ $result_trees{'redirection_same_labels'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/html_tests/ref_in_preformatted.pl 
b/tp/t/results/html_tests/ref_in_preformatted.pl
index f1489b6c66..3759a7c117 100644
--- a/tp/t/results/html_tests/ref_in_preformatted.pl
+++ b/tp/t/results/html_tests/ref_in_preformatted.pl
@@ -127,7 +127,6 @@ $result_trees{'ref_in_preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -280,7 +279,6 @@ $result_trees{'ref_in_preformatted'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index a2beda5374..3268cf2cb1 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -207,7 +207,6 @@ $result_trees{'simple_menu'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'itemize',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'itemize'
                               },
@@ -276,7 +275,6 @@ $result_trees{'simple_menu'} = {
                                   ],
                                   'cmdname' => 'end',
                                   'extra' => {
-                                    'command_argument' => 'html',
                                     'spaces_before_argument' => ' ',
                                     'text_arg' => 'html'
                                   },
@@ -415,7 +413,6 @@ $result_trees{'simple_menu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -490,7 +487,6 @@ $result_trees{'simple_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'html',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'html'
                       },
@@ -599,7 +595,6 @@ $result_trees{'simple_menu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -976,7 +971,6 @@ $result_trees{'simple_menu'} = {
                                   ],
                                   'cmdname' => 'end',
                                   'extra' => {
-                                    'command_argument' => 'itemize',
                                     'spaces_before_argument' => ' ',
                                     'text_arg' => 'itemize'
                                   },
@@ -1045,7 +1039,6 @@ $result_trees{'simple_menu'} = {
                                       ],
                                       'cmdname' => 'end',
                                       'extra' => {
-                                        'command_argument' => 'html',
                                         'spaces_before_argument' => ' ',
                                         'text_arg' => 'html'
                                       },
@@ -1184,7 +1177,6 @@ $result_trees{'simple_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'itemize',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'itemize'
                       },
@@ -1259,7 +1251,6 @@ $result_trees{'simple_menu'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'html',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'html'
                           },
@@ -1368,7 +1359,6 @@ $result_trees{'simple_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'itemize',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'itemize'
                       },
@@ -1637,7 +1627,6 @@ $result_trees{'simple_menu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -1678,7 +1667,6 @@ $result_trees{'simple_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 5c264f61fd..5e304aa544 100644
--- a/tp/t/results/html_tests/simple_menu_in_example.pl
+++ b/tp/t/results/html_tests/simple_menu_in_example.pl
@@ -152,7 +152,6 @@ $result_trees{'simple_menu_in_example'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'cartouche',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'cartouche'
                               },
@@ -253,7 +252,6 @@ $result_trees{'simple_menu_in_example'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'cartouche',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'cartouche'
                           },
@@ -478,7 +476,6 @@ $result_trees{'simple_menu_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'menu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
@@ -519,7 +516,6 @@ $result_trees{'simple_menu_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl 
b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
index 2d7082e05b..93328d19f8 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle.pl
@@ -168,7 +168,6 @@ $result_trees{'test_xrefautomaticsectiontitle'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 9b18febd77..f26c4ef799 100644
--- a/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
+++ b/tp/t/results/html_tests/test_xrefautomaticsectiontitle_off_first.pl
@@ -212,7 +212,6 @@ $result_trees{'test_xrefautomaticsectiontitle_off_first'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 566786477b..e590c14606 100644
--- a/tp/t/results/html_tests/tex_expanded_in_copying.pl
+++ b/tp/t/results/html_tests/tex_expanded_in_copying.pl
@@ -67,7 +67,6 @@ $result_trees{'tex_expanded_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'tex',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
@@ -108,7 +107,6 @@ $result_trees{'tex_expanded_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 ffa671d922..48b055aee9 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
@@ -269,7 +269,6 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'multitable',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'multitable'
                   },
@@ -313,7 +312,6 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/htmlxref/htmlxref.pl 
b/tp/t/results/htmlxref/htmlxref.pl
index 17993fd214..0a6bf525d6 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -228,7 +228,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -440,7 +439,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -607,7 +605,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -785,7 +782,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -947,7 +943,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1155,7 +1150,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1365,7 +1359,6 @@ $result_trees{'htmlxref'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1501,7 +1494,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1671,7 +1663,6 @@ $result_trees{'htmlxref'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1811,7 +1802,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1958,7 +1948,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2125,7 +2114,6 @@ $result_trees{'htmlxref'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -2256,7 +2244,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2460,7 +2447,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2607,7 +2593,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2839,7 +2824,6 @@ $result_trees{'htmlxref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index 7a3eee6004..3df80dc031 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -228,7 +228,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -440,7 +439,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -607,7 +605,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -785,7 +782,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -947,7 +943,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1155,7 +1150,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1365,7 +1359,6 @@ $result_trees{'htmlxref_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1501,7 +1494,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1671,7 +1663,6 @@ $result_trees{'htmlxref_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1811,7 +1802,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1958,7 +1948,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2125,7 +2114,6 @@ $result_trees{'htmlxref_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -2256,7 +2244,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2460,7 +2447,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2607,7 +2593,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2839,7 +2824,6 @@ $result_trees{'htmlxref_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index 2d1ff601fe..f342de901b 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -228,7 +228,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -440,7 +439,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -607,7 +605,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -785,7 +782,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -947,7 +943,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1155,7 +1150,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1365,7 +1359,6 @@ $result_trees{'htmlxref_only_mono'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1501,7 +1494,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1671,7 +1663,6 @@ $result_trees{'htmlxref_only_mono'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1811,7 +1802,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1958,7 +1948,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2125,7 +2114,6 @@ $result_trees{'htmlxref_only_mono'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -2256,7 +2244,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2460,7 +2447,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2607,7 +2593,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2839,7 +2824,6 @@ $result_trees{'htmlxref_only_mono'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 5e45a1460f..2285e17972 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -228,7 +228,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -440,7 +439,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -607,7 +605,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -785,7 +782,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -947,7 +943,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1155,7 +1150,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1365,7 +1359,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1501,7 +1494,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1671,7 +1663,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1811,7 +1802,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1958,7 +1948,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2125,7 +2114,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -2256,7 +2244,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2460,7 +2447,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2607,7 +2593,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2839,7 +2824,6 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl 
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 960787480b..83f270e992 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -228,7 +228,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -440,7 +439,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -607,7 +605,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -785,7 +782,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -947,7 +943,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1155,7 +1150,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1365,7 +1359,6 @@ $result_trees{'htmlxref_only_split'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1501,7 +1494,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1671,7 +1663,6 @@ $result_trees{'htmlxref_only_split'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1811,7 +1802,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1958,7 +1948,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2125,7 +2114,6 @@ $result_trees{'htmlxref_only_split'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -2256,7 +2244,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2460,7 +2447,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2607,7 +2593,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2839,7 +2824,6 @@ $result_trees{'htmlxref_only_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl 
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index a5de583114..300a639a69 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -228,7 +228,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -440,7 +439,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -607,7 +605,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -785,7 +782,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -947,7 +943,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1155,7 +1150,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1365,7 +1359,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1501,7 +1494,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1671,7 +1663,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -1811,7 +1802,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1958,7 +1948,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2125,7 +2114,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -2256,7 +2244,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2460,7 +2447,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2607,7 +2593,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2839,7 +2824,6 @@ $result_trees{'htmlxref_only_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/indices/double_index_entry.pl 
b/tp/t/results/indices/double_index_entry.pl
index 34faeb9b6e..0ff96d2d0e 100644
--- a/tp/t/results/indices/double_index_entry.pl
+++ b/tp/t/results/indices/double_index_entry.pl
@@ -244,7 +244,6 @@ $result_trees{'double_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index f08111910c..3ae26c16e2 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -182,7 +182,6 @@ $result_trees{'empty_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index d8b14857cf..07a1dea888 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -254,7 +254,6 @@ $result_trees{'empty_string_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'ftable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'ftable'
               },
@@ -596,7 +595,6 @@ $result_trees{'empty_string_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
diff --git a/tp/t/results/indices/ftable_vtable.pl 
b/tp/t/results/indices/ftable_vtable.pl
index dc401441b5..f6b4a64d51 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -261,7 +261,6 @@ $result_trees{'ftable_vtable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'ftable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'ftable'
               },
@@ -514,7 +513,6 @@ $result_trees{'ftable_vtable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
diff --git a/tp/t/results/indices/index_entry_before_node.pl 
b/tp/t/results/indices/index_entry_before_node.pl
index 9ad5d5fcdb..1a10a183b4 100644
--- a/tp/t/results/indices/index_entry_before_node.pl
+++ b/tp/t/results/indices/index_entry_before_node.pl
@@ -190,7 +190,6 @@ $result_trees{'index_entry_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 d0291bc8c2..8a79993a48 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
@@ -133,7 +133,6 @@ $result_trees{'index_entry_in_footnote_different_node_end'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 6f66e987bd..a8613609ef 100644
--- a/tp/t/results/indices/index_entry_in_footnote_separate.pl
+++ b/tp/t/results/indices/index_entry_in_footnote_separate.pl
@@ -165,7 +165,6 @@ $result_trees{'index_entry_in_footnote_separate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 12bbed09c9..363b551a8e 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -305,7 +305,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'defun',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'defun'
                       },
@@ -471,7 +470,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'ftable',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'ftable'
                       },
@@ -557,7 +555,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -783,7 +780,6 @@ $result_trees{'printindex_index_entry_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 638cbc403a..a0a7a20e6d 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
@@ -188,7 +188,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -414,7 +413,6 @@ 
$result_trees{'printindex_index_entry_in_copying_in_footnote'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 e06926f458..8ce56eaf31 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
@@ -305,7 +305,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'defun',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'defun'
                       },
@@ -471,7 +470,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'ftable',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'ftable'
                       },
@@ -557,7 +555,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -766,7 +763,6 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 9fa93e63d0..6c634160d7 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -280,7 +280,6 @@ $result_trees{'same_index_entry_merged_indices'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -426,7 +425,6 @@ $result_trees{'same_index_entry_merged_indices'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvar'
               },
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 2a6d1446d0..a89c9570cb 100644
--- a/tp/t/results/info_tests/before_node_and_section.pl
+++ b/tp/t/results/info_tests/before_node_and_section.pl
@@ -310,7 +310,6 @@ $result_trees{'before_node_and_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -563,7 +562,6 @@ $result_trees{'before_node_and_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/info_tests/center_flush.pl 
b/tp/t/results/info_tests/center_flush.pl
index 2fd5600ac1..7d731b869d 100644
--- a/tp/t/results/info_tests/center_flush.pl
+++ b/tp/t/results/info_tests/center_flush.pl
@@ -193,7 +193,6 @@ $result_trees{'center_flush'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushleft',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushleft'
               },
@@ -413,7 +412,6 @@ $result_trees{'center_flush'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
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 fae5d12ec7..e25fbe03d4 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -219,7 +219,6 @@ $result_trees{'colon_in_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
@@ -536,7 +535,6 @@ $result_trees{'colon_in_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defvr',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defvr'
               },
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 077b986fd8..38bb27bf87 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
@@ -235,7 +235,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -531,7 +530,6 @@ $result_trees{'colons_in_index_entries_and_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
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 26d32b8670..44a2b1706e 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
@@ -235,7 +235,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -531,7 +530,6 @@ 
$result_trees{'colons_in_index_entries_and_node_no_quoting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index 03a7d6c2db..11acb3525d 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -383,7 +383,6 @@ $result_trees{'def_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'deffn',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'deffn'
                   },
@@ -425,7 +424,6 @@ $result_trees{'def_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
@@ -679,7 +677,6 @@ $result_trees{'def_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
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 bd548b9d9d..21e8c9012f 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -202,7 +202,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'direntry',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
@@ -382,7 +381,6 @@ $result_trees{'direntry_dircategory_and_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'direntry',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
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 6820c86d95..80a5048128 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
@@ -986,7 +986,6 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/info_tests/error_in_footnote.pl 
b/tp/t/results/info_tests/error_in_footnote.pl
index 120ab5f4bc..f2bf9a9d1f 100644
--- a/tp/t/results/info_tests/error_in_footnote.pl
+++ b/tp/t/results/info_tests/error_in_footnote.pl
@@ -271,7 +271,6 @@ $result_trees{'error_in_footnote'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/info_tests/float_long_captions.pl 
b/tp/t/results/info_tests/float_long_captions.pl
index 76335e517c..e8367e8286 100644
--- a/tp/t/results/info_tests/float_long_captions.pl
+++ b/tp/t/results/info_tests/float_long_captions.pl
@@ -122,7 +122,6 @@ $result_trees{'float_long_captions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -247,7 +246,6 @@ $result_trees{'float_long_captions'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 e8525f0e8d..c7268f423b 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
@@ -231,7 +231,6 @@ $result_trees{'index_entry_at_end_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 4809df6282..dcd1db8179 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
@@ -353,7 +353,6 @@ $result_trees{'invalid_node_name_no_warning'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 28be707d28..6aefdb4046 100644
--- a/tp/t/results/info_tests/invalid_node_name_warning.pl
+++ b/tp/t/results/info_tests/invalid_node_name_warning.pl
@@ -353,7 +353,6 @@ $result_trees{'invalid_node_name_warning'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 b55b3b4e21..a4c9b3f645 100644
--- a/tp/t/results/info_tests/multiline_image_and_align.pl
+++ b/tp/t/results/info_tests/multiline_image_and_align.pl
@@ -441,7 +441,6 @@ $result_trees{'multiline_image_and_align'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
@@ -1173,7 +1172,6 @@ $result_trees{'multiline_image_and_align'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
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 9607870376..d4f9262e6c 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
@@ -419,7 +419,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -805,7 +804,6 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 a889f0789d..0dbf3b60c1 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -290,7 +290,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'multitable',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'multitable'
                               },
@@ -534,7 +533,6 @@ $result_trees{'nested_multitable_anchor_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/info_tests/paragraphindent_and_preamble.pl 
b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
index 9398837799..2adfeba569 100644
--- a/tp/t/results/info_tests/paragraphindent_and_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_and_preamble.pl
@@ -72,7 +72,6 @@ $result_trees{'paragraphindent_and_preamble'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
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 6686644476..af8b2a4e8c 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
@@ -72,7 +72,6 @@ $result_trees{'paragraphindent_in_preamble_and_in_document'} 
= {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
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 e5733e4c7e..feb99ba9ef 100644
--- a/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
+++ b/tp/t/results/info_tests/paragraphindent_not_in_preamble.pl
@@ -72,7 +72,6 @@ $result_trees{'paragraphindent_not_in_preamble'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
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 142b936005..e14e771e03 100644
--- a/tp/t/results/info_tests/quote_node_names_info.pl
+++ b/tp/t/results/info_tests/quote_node_names_info.pl
@@ -1969,7 +1969,6 @@ $result_trees{'quote_node_names_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 c09d4600c0..b7248ffeb4 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -152,7 +152,6 @@ $result_trees{'space_at_menu_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/info_tests/space_in_menu.pl 
b/tp/t/results/info_tests/space_in_menu.pl
index 271cbdf027..65576b66ea 100644
--- a/tp/t/results/info_tests/space_in_menu.pl
+++ b/tp/t/results/info_tests/space_in_menu.pl
@@ -185,7 +185,6 @@ $result_trees{'space_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/info_tests/split_no_copying.pl 
b/tp/t/results/info_tests/split_no_copying.pl
index 048e5baf10..74fef89d41 100644
--- a/tp/t/results/info_tests/split_no_copying.pl
+++ b/tp/t/results/info_tests/split_no_copying.pl
@@ -232,7 +232,6 @@ $result_trees{'split_no_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 095118b26a..f5431279db 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
@@ -238,7 +238,6 @@ $result_trees{'split_test_before_first_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 97145911b7..9142f6c693 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
@@ -232,7 +232,6 @@ $result_trees{'split_test_before_first_node_no_empty_line'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index e38a352803..357280768c 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -741,7 +741,6 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
@@ -994,7 +993,6 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'ftable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'ftable'
               },
@@ -1171,7 +1169,6 @@ $result_trees{'test_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/info_tests/text_before_node.pl 
b/tp/t/results/info_tests/text_before_node.pl
index fc8baac61a..5758412f1c 100644
--- a/tp/t/results/info_tests/text_before_node.pl
+++ b/tp/t/results/info_tests/text_before_node.pl
@@ -168,7 +168,6 @@ $result_trees{'text_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/info_tests/top_node_normalization.pl 
b/tp/t/results/info_tests/top_node_normalization.pl
index 6bfe9a1072..0010e4a47d 100644
--- a/tp/t/results/info_tests/top_node_normalization.pl
+++ b/tp/t/results/info_tests/top_node_normalization.pl
@@ -210,7 +210,6 @@ $result_trees{'top_node_normalization'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 416789fc11..a08eaba801 100644
--- a/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
+++ b/tp/t/results/info_tests/two_paragraphindent_in_preamble.pl
@@ -72,7 +72,6 @@ $result_trees{'two_paragraphindent_in_preamble'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
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 f875c6326f..af2a41c96f 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
@@ -72,7 +72,6 @@ 
$result_trees{'two_paragraphindent_in_preamble_and_in_document'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
diff --git a/tp/t/results/init_files_tests/documentation_examples.pl 
b/tp/t/results/init_files_tests/documentation_examples.pl
index 53a9e70c9e..1b5a05efce 100644
--- a/tp/t/results/init_files_tests/documentation_examples.pl
+++ b/tp/t/results/init_files_tests/documentation_examples.pl
@@ -605,7 +605,6 @@ $result_trees{'documentation_examples'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/invalid_nestings/bad_style_nesting.pl 
b/tp/t/results/invalid_nestings/bad_style_nesting.pl
index c3bd257ce0..2bf393f6e3 100644
--- a/tp/t/results/invalid_nestings/bad_style_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_style_nesting.pl
@@ -82,7 +82,6 @@ $result_trees{'bad_style_nesting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl 
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index cf7e411db3..28569c3980 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -151,7 +151,6 @@ $result_trees{'bad_tab_nesting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 a016ae959b..2b972e083f 100644
--- a/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/cartouche_in_style_command.pl
@@ -82,7 +82,6 @@ $result_trees{'cartouche_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'cartouche',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index f168a26464..783d1a4f9d 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -615,7 +615,6 @@ $result_trees{'center'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -773,7 +772,6 @@ $result_trees{'center'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1230,7 +1228,6 @@ $result_trees{'center'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 d1e8d73cd2..85dba1d9cb 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -169,7 +169,6 @@ $result_trees{'def_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
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 166a220bdd..fc45770cbe 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
@@ -228,7 +228,6 @@ $result_trees{'def_not_closed_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 0f92a6b740..6f9d016854 100644
--- a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
@@ -102,7 +102,6 @@ $result_trees{'enumerate_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
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 c7058ad4d8..65dcdf32a5 100644
--- a/tp/t/results/invalid_nestings/example_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/example_in_style_command.pl
@@ -82,7 +82,6 @@ $result_trees{'example_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
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 9a53cd5877..9d3e1aed68 100644
--- a/tp/t/results/invalid_nestings/float_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/float_in_style_command.pl
@@ -134,7 +134,6 @@ $result_trees{'float_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 5bbfabae39..d2dff1b865 100644
--- a/tp/t/results/invalid_nestings/flushright_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/flushright_in_style_command.pl
@@ -82,7 +82,6 @@ $result_trees{'flushright_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
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 1962d753ab..c03a6ae76d 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
@@ -261,7 +261,6 @@ $result_trees{'formats_not_closed_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl 
b/tp/t/results/invalid_nestings/in_errormsg.pl
index 64a00de14d..2778b95299 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -258,7 +258,6 @@ $result_trees{'in_errormsg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index dedca8a995..8a810e4c3a 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -89,7 +89,6 @@ $result_trees{'in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -599,7 +598,6 @@ $result_trees{'in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -932,7 +930,6 @@ $result_trees{'in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl 
b/tp/t/results/invalid_nestings/item_in_ref.pl
index 154896de4c..2e9d4e4a42 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -204,7 +204,6 @@ $result_trees{'item_in_ref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
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 b823dd3d7b..7c96fbd4e1 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
@@ -164,7 +164,6 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'itemize',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'itemize'
                           },
@@ -260,7 +259,6 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'enumerate',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'enumerate'
                           },
@@ -316,7 +314,6 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 4e71e1a1ec..92a4a120e0 100644
--- a/tp/t/results/invalid_nestings/menu_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/menu_in_style_command.pl
@@ -163,7 +163,6 @@ $result_trees{'menu_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 d6861a11b1..d737074b14 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -167,7 +167,6 @@ $result_trees{'multitable_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 350a79f2d9..c0bc1452ff 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -118,7 +118,6 @@ $result_trees{'multitable_item_in_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 8022ed190f..4c1a8a9d84 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -160,7 +160,6 @@ $result_trees{'on_block_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -359,7 +358,6 @@ $result_trees{'on_block_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index f349183272..6ca925c732 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -415,7 +415,6 @@ $result_trees{'on_def_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index bbc2d8a6e4..8fee3dd6f8 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -196,7 +196,6 @@ $result_trees{'on_itemize_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -272,7 +271,6 @@ $result_trees{'on_itemize_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/invalid_nestings/quotation_in_ref.pl 
b/tp/t/results/invalid_nestings/quotation_in_ref.pl
index 10b2b7071e..d85c7908e7 100644
--- a/tp/t/results/invalid_nestings/quotation_in_ref.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_ref.pl
@@ -118,7 +118,6 @@ $result_trees{'quotation_in_ref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
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 bf901544c2..7537e87c10 100644
--- a/tp/t/results/invalid_nestings/quotation_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/quotation_in_style_command.pl
@@ -82,7 +82,6 @@ $result_trees{'quotation_in_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/invalid_nestings/recursive_copying.pl 
b/tp/t/results/invalid_nestings/recursive_copying.pl
index c5f6c15b06..ce5afe82ec 100644
--- a/tp/t/results/invalid_nestings/recursive_copying.pl
+++ b/tp/t/results/invalid_nestings/recursive_copying.pl
@@ -65,7 +65,6 @@ $result_trees{'recursive_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
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 4c743b4940..0409651931 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
@@ -75,7 +75,6 @@ $result_trees{'style_not_closed_in_block_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'cartouche',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
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 2491eecf8d..6a90553c75 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
@@ -177,7 +177,6 @@ $result_trees{'style_not_closed_in_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
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 4204baa2b8..86587f81f9 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
@@ -168,7 +168,6 @@ $result_trees{'style_not_closed_no_newline_root_commands'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 a014bc50f6..7be35d394f 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
@@ -168,7 +168,6 @@ $result_trees{'style_not_closed_root_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl 
b/tp/t/results/invalid_nestings/tab_in_index.pl
index a1db491f3c..8a50fe96ba 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -182,7 +182,6 @@ $result_trees{'tab_in_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl 
b/tp/t/results/invalid_nestings/table_in_code.pl
index 03ba1db479..8d431dacb3 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -145,7 +145,6 @@ $result_trees{'table_in_code'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
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 19369ee181..54a0a6753f 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
@@ -224,7 +224,6 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 5901ddcdeb..8a755cc397 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
@@ -200,7 +200,6 @@ $result_trees{'table_not_closed_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 000e050bec..179b82e594 100644
--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
@@ -210,7 +210,6 @@ $result_trees{'table_on_item_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/itemize/accent_argument.pl 
b/tp/t/results/itemize/accent_argument.pl
index 6c6e28645f..408657213f 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -83,7 +83,6 @@ $result_trees{'accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -194,7 +193,6 @@ $result_trees{'accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/itemize/asis_as_itemize_argument.pl 
b/tp/t/results/itemize/asis_as_itemize_argument.pl
index c59d4a7784..344291044d 100644
--- a/tp/t/results/itemize/asis_as_itemize_argument.pl
+++ b/tp/t/results/itemize/asis_as_itemize_argument.pl
@@ -80,7 +80,6 @@ $result_trees{'asis_as_itemize_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/itemize/bad_enumerate_arguments.pl 
b/tp/t/results/itemize/bad_enumerate_arguments.pl
index a6a5290f41..00b7d76313 100644
--- a/tp/t/results/itemize/bad_enumerate_arguments.pl
+++ b/tp/t/results/itemize/bad_enumerate_arguments.pl
@@ -47,7 +47,6 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -115,7 +114,6 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -201,7 +199,6 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -273,7 +270,6 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -341,7 +337,6 @@ $result_trees{'bad_enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
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 9c00f7f965..6627730716 100644
--- a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
+++ b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
@@ -84,7 +84,6 @@ $result_trees{'comment_first_on_enumerate_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
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 56f39d62b0..5cba380cf8 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -91,7 +91,6 @@ $result_trees{'comment_first_on_itemize_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/itemize/empty_accent_argument.pl 
b/tp/t/results/itemize/empty_accent_argument.pl
index db2a56b56c..604b902440 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -96,7 +96,6 @@ $result_trees{'empty_accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -196,7 +195,6 @@ $result_trees{'empty_accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -303,7 +301,6 @@ $result_trees{'empty_accent_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/itemize/enumerate_and_empty_lines.pl 
b/tp/t/results/itemize/enumerate_and_empty_lines.pl
index 1076474388..2bceea34ad 100644
--- a/tp/t/results/itemize/enumerate_and_empty_lines.pl
+++ b/tp/t/results/itemize/enumerate_and_empty_lines.pl
@@ -116,7 +116,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -251,7 +250,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -340,7 +338,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'quotation',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
@@ -441,7 +438,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'quotation',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
@@ -493,7 +489,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -581,7 +576,6 @@ $result_trees{'enumerate_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
diff --git a/tp/t/results/itemize/enumerate_argument.pl 
b/tp/t/results/itemize/enumerate_argument.pl
index 842892be3e..4af905c976 100644
--- a/tp/t/results/itemize/enumerate_argument.pl
+++ b/tp/t/results/itemize/enumerate_argument.pl
@@ -47,7 +47,6 @@ $result_trees{'enumerate_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -131,7 +130,6 @@ $result_trees{'enumerate_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -216,7 +214,6 @@ $result_trees{'enumerate_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
diff --git a/tp/t/results/itemize/enumerate_argument_item.pl 
b/tp/t/results/itemize/enumerate_argument_item.pl
index 7c68c7f72c..b07ec6a105 100644
--- a/tp/t/results/itemize/enumerate_argument_item.pl
+++ b/tp/t/results/itemize/enumerate_argument_item.pl
@@ -99,7 +99,6 @@ $result_trees{'enumerate_argument_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -235,7 +234,6 @@ $result_trees{'enumerate_argument_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -372,7 +370,6 @@ $result_trees{'enumerate_argument_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
diff --git a/tp/t/results/itemize/enumerate_in_example.pl 
b/tp/t/results/itemize/enumerate_in_example.pl
index a93a442ecb..489e924672 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -125,7 +125,6 @@ $result_trees{'enumerate_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'enumerate',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'enumerate'
                   },
@@ -167,7 +166,6 @@ $result_trees{'enumerate_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/itemize/enumerate_letters.pl 
b/tp/t/results/itemize/enumerate_letters.pl
index 3b01b22aa6..09a4905518 100644
--- a/tp/t/results/itemize/enumerate_letters.pl
+++ b/tp/t/results/itemize/enumerate_letters.pl
@@ -5403,7 +5403,6 @@ $result_trees{'enumerate_letters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
diff --git a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl 
b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
index 0219253067..b77f171c64 100644
--- a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
@@ -112,7 +112,6 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
diff --git a/tp/t/results/itemize/headitem_itemx_in_itemize.pl 
b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
index a29e5aaf3a..c4b268798e 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -119,7 +119,6 @@ $result_trees{'headitem_itemx_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 5004192212..2d1b423c47 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -250,7 +250,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -397,7 +396,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -538,7 +536,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -679,7 +676,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -825,7 +821,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -1060,7 +1055,6 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 f7223475ca..29ba443509 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -297,7 +297,6 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -520,7 +519,6 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -692,7 +690,6 @@ $result_trees{'inter_item_commands_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl 
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index ca0d112a1f..fc4ae84541 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -121,7 +121,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -256,7 +255,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -322,7 +320,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'quotation',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
@@ -423,7 +420,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'quotation',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
@@ -475,7 +471,6 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -618,7 +613,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -753,7 +747,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -842,7 +835,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'quotation',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
@@ -943,7 +935,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'quotation',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
@@ -995,7 +986,6 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1111,7 +1101,6 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1285,7 +1274,6 @@ $result_trees{'itemize_and_empty_lines'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'itemize',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'itemize'
                       },
@@ -1351,7 +1339,6 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -1520,7 +1507,6 @@ $result_trees{'itemize_and_empty_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/itemize/itemize_in_example.pl 
b/tp/t/results/itemize/itemize_in_example.pl
index 8d180debcc..59cbb0040d 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -105,7 +105,6 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -212,7 +211,6 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -312,7 +310,6 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -411,7 +408,6 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -527,7 +523,6 @@ $result_trees{'itemize_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -569,7 +564,6 @@ $result_trees{'itemize_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 6c1a2cf609..6784288811 100644
--- a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
+++ b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
@@ -87,7 +87,6 @@ $result_trees{'itemize_line_commands_with_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -195,7 +194,6 @@ $result_trees{'itemize_line_commands_with_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/itemize/itemize_long_item.pl 
b/tp/t/results/itemize/itemize_long_item.pl
index 76c70bbeaa..19739a0a73 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -121,7 +121,6 @@ $result_trees{'itemize_long_item'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -256,7 +255,6 @@ $result_trees{'itemize_long_item'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -345,7 +343,6 @@ $result_trees{'itemize_long_item'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'quotation',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
@@ -446,7 +443,6 @@ $result_trees{'itemize_long_item'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'quotation',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'quotation'
                       },
@@ -498,7 +494,6 @@ $result_trees{'itemize_long_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/itemize/table_in_itemize.pl 
b/tp/t/results/itemize/table_in_itemize.pl
index bbedabbcd9..20ac040617 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -266,7 +266,6 @@ $result_trees{'table_in_itemize'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'table',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'table'
                       },
@@ -342,7 +341,6 @@ $result_trees{'table_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/itemize/w_argument.pl 
b/tp/t/results/itemize/w_argument.pl
index a91227412e..857b3ed78d 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -157,7 +157,6 @@ $result_trees{'w_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index 0e2f13b0b0..6e081b42be 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -236,7 +236,6 @@ $result_trees{'multiple'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'defivar',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'defivar'
                       },
@@ -278,7 +277,6 @@ $result_trees{'multiple'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -634,7 +632,6 @@ $result_trees{'multiple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -932,7 +929,6 @@ $result_trees{'multiple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 50ae5a2c15..65d39157d3 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -236,7 +236,6 @@ $result_trees{'multiple_in_preamble'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'defivar',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'defivar'
                       },
@@ -278,7 +277,6 @@ $result_trees{'multiple_in_preamble'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -668,7 +666,6 @@ $result_trees{'multiple_in_preamble'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -874,7 +871,6 @@ $result_trees{'multiple_in_preamble'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
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 7f4d04ec48..4f1c5ad9b3 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -236,7 +236,6 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'defivar',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'defivar'
                       },
@@ -278,7 +277,6 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -720,7 +718,6 @@ $result_trees{'multiple_in_preamble_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index cafcc76d5a..a5d53c3791 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -522,7 +522,6 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -844,7 +843,6 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -1167,7 +1165,6 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -1444,7 +1441,6 @@ $result_trees{'multiple_lang_chapters'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 3b5c607ab1..c69b5866b5 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -522,7 +522,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -844,7 +843,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -1167,7 +1165,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -1444,7 +1441,6 @@ $result_trees{'multiple_lang_chapters_latex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index bf7d91370a..cdaef561ee 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -493,7 +493,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -815,7 +814,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -1138,7 +1136,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
@@ -1415,7 +1412,6 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
diff --git a/tp/t/results/languages/simple.pl b/tp/t/results/languages/simple.pl
index 083c80d2fe..5899bca85f 100644
--- a/tp/t/results/languages/simple.pl
+++ b/tp/t/results/languages/simple.pl
@@ -221,7 +221,6 @@ $result_trees{'simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 936a03117b..8f93954934 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -221,7 +221,6 @@ $result_trees{'unknown_region'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defivar',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defivar'
               },
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl 
b/tp/t/results/latex_tests/anchor_in_copying.pl
index 824b229b6f..515ae4661e 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -90,7 +90,6 @@ $result_trees{'anchor_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
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 51af68e3f1..cc8e085789 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
@@ -90,7 +90,6 @@ $result_trees{'anchor_in_copying_insertcopying_chap'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
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 ed5b91b1cf..a018623e52 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
@@ -90,7 +90,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -251,7 +250,6 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
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 d95f43d6ac..ca21c45417 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
@@ -90,7 +90,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -214,7 +213,6 @@ 
$result_trees{'anchor_in_copying_insertcopying_titlepage_chap'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index b375ccbb63..eb4023ee44 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -116,7 +116,6 @@ $result_trees{'brace_in_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
@@ -479,7 +478,6 @@ $result_trees{'brace_in_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'defun',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'defun'
               },
diff --git a/tp/t/results/latex_tests/enumerate_arguments.pl 
b/tp/t/results/latex_tests/enumerate_arguments.pl
index 879f8ff5f1..457cb84439 100644
--- a/tp/t/results/latex_tests/enumerate_arguments.pl
+++ b/tp/t/results/latex_tests/enumerate_arguments.pl
@@ -104,7 +104,6 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -224,7 +223,6 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -344,7 +342,6 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -464,7 +461,6 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -584,7 +580,6 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -704,7 +699,6 @@ $result_trees{'enumerate_arguments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
diff --git a/tp/t/results/latex_tests/example_in_cartouche.pl 
b/tp/t/results/latex_tests/example_in_cartouche.pl
index cc2093eccc..b09c8d49d2 100644
--- a/tp/t/results/latex_tests/example_in_cartouche.pl
+++ b/tp/t/results/latex_tests/example_in_cartouche.pl
@@ -75,7 +75,6 @@ $result_trees{'example_in_cartouche'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'cartouche',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
@@ -166,7 +165,6 @@ $result_trees{'example_in_cartouche'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -207,7 +205,6 @@ $result_trees{'example_in_cartouche'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'cartouche',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index e4c037e4c3..8a625fb329 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -288,7 +288,6 @@ $result_trees{'float_and_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -459,7 +458,6 @@ $result_trees{'float_and_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -633,7 +631,6 @@ $result_trees{'float_and_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl 
b/tp/t/results/latex_tests/nested_enumerate.pl
index 3ac2223d0c..e558dd641a 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -321,7 +321,6 @@ $result_trees{'nested_enumerate'} = {
                                       ],
                                       'cmdname' => 'end',
                                       'extra' => {
-                                        'command_argument' => 'enumerate',
                                         'spaces_before_argument' => ' ',
                                         'text_arg' => 'enumerate'
                                       },
@@ -375,7 +374,6 @@ $result_trees{'nested_enumerate'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'enumerate',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'enumerate'
                               },
@@ -429,7 +427,6 @@ $result_trees{'nested_enumerate'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'enumerate',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'enumerate'
                       },
@@ -483,7 +480,6 @@ $result_trees{'nested_enumerate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index 9ef5966f4a..f7c3c5ffaf 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -349,7 +349,6 @@ $result_trees{'nested_itemize'} = {
                                       ],
                                       'cmdname' => 'end',
                                       'extra' => {
-                                        'command_argument' => 'itemize',
                                         'spaces_before_argument' => ' ',
                                         'text_arg' => 'itemize'
                                       },
@@ -403,7 +402,6 @@ $result_trees{'nested_itemize'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'itemize',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'itemize'
                               },
@@ -457,7 +455,6 @@ $result_trees{'nested_itemize'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'itemize',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'itemize'
                       },
@@ -511,7 +508,6 @@ $result_trees{'nested_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 0e45c9a796..5c15ec1e19 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -129,7 +129,6 @@ $result_trees{'setchapternewpage_on_odd_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl 
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index dea083a10b..6d0c6164d9 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -55,7 +55,6 @@ $result_trees{'titlepage_and_headings'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
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 bd30421a6a..7c03fef027 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -92,7 +92,6 @@ $result_trees{'titlepage_and_setchapternewpage_odd'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
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 0eff3819cc..cd9efbde71 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -92,7 +92,6 @@ $result_trees{'titlepage_and_setchapternewpage_on'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index e14881b55c..2837e83aa8 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -55,7 +55,6 @@ $result_trees{'titlepage_classical'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -341,7 +340,6 @@ $result_trees{'titlepage_classical'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
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 c43e903072..0925cc3f15 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -162,7 +162,6 @@ $result_trees{'titlepage_in_top_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'titlepage',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'titlepage'
               },
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 6ea3fd6f50..7b7a04c6e4 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -86,7 +86,6 @@ $result_trees{'titlepage_long_title'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index 1e760efa12..2460d7813e 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -72,7 +72,6 @@ $result_trees{'titlepage_no_author'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index cda99a4f6e..9dccfd047b 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -106,7 +106,6 @@ $result_trees{'titlepage_no_title'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
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 f590c98ebc..efd356c104 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -55,7 +55,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -367,7 +366,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
                                       ],
                                       'cmdname' => 'end',
                                       'extra' => {
-                                        'command_argument' => 'displaymath',
                                         'spaces_before_argument' => ' ',
                                         'text_arg' => 'displaymath'
                                       },
@@ -520,7 +518,6 @@ $result_trees{'titlepage_with_commands_classical'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/latex_tests/verbatim_in_smallformat.pl 
b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
index 955d3ac041..e949da6b58 100644
--- a/tp/t/results/latex_tests/verbatim_in_smallformat.pl
+++ b/tp/t/results/latex_tests/verbatim_in_smallformat.pl
@@ -79,7 +79,6 @@ $result_trees{'verbatim_in_smallformat'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'smallformat',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'smallformat'
               },
diff --git a/tp/t/results/layout/navigation.pl 
b/tp/t/results/layout/navigation.pl
index e7cbe13509..e342756c9a 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_chapter.pl 
b/tp/t/results/layout/navigation_chapter.pl
index 9dfb9f7ac3..3495d88689 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl 
b/tp/t/results/layout/navigation_chapter_no_header.pl
index a79f9ad144..8ef782ea0e 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_chapter_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 50145f3500..634aaebf83 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl 
b/tp/t/results/layout/navigation_chapter_vertical.pl
index 03220bda01..bf0dc18a3e 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_chapter_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_no_header.pl 
b/tp/t/results/layout/navigation_no_header.pl
index ddda956b13..2fc66bb4ec 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl 
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 19f2223f3c..1948b0cbd7 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_node.pl 
b/tp/t/results/layout/navigation_node.pl
index c014887f88..f039fd73d9 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_node_no_header.pl 
b/tp/t/results/layout/navigation_node_no_header.pl
index a3958e9cd3..a01d2ecfb1 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_node_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 b8c1ca2333..e9fdadfc02 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_node_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_node_vertical.pl 
b/tp/t/results/layout/navigation_node_vertical.pl
index 8d114d1f94..9dcd522174 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_node_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_section.pl 
b/tp/t/results/layout/navigation_section.pl
index 1439149258..2b37cfe165 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_section_no_header.pl 
b/tp/t/results/layout/navigation_section_no_header.pl
index 2de24a52a3..b94334de96 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_section_no_header'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 6b604a18cd..5eeea7e3f5 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_section_no_header_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_section_vertical.pl 
b/tp/t/results/layout/navigation_section_vertical.pl
index 5447347bde..33511096b4 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_section_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/navigation_vertical.pl 
b/tp/t/results/layout/navigation_vertical.pl
index a12926bb1e..38a6d8e4d8 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -234,7 +234,6 @@ $result_trees{'navigation_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -429,7 +428,6 @@ $result_trees{'navigation_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -850,7 +848,6 @@ $result_trees{'navigation_vertical'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/layout/no_monolithic.pl 
b/tp/t/results/layout/no_monolithic.pl
index 521ddb55a6..15ba771184 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -330,7 +330,6 @@ $result_trees{'no_monolithic'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/macro/complete_macro_for_end.pl 
b/tp/t/results/macro/complete_macro_for_end.pl
index 98ea6c482f..0591bb891e 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -83,7 +83,6 @@ $result_trees{'complete_macro_for_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'cartouche',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
diff --git a/tp/t/results/macro/macro_for_end.pl 
b/tp/t/results/macro/macro_for_end.pl
index 5d3515519d..d4538d4308 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -87,7 +87,6 @@ $result_trees{'macro_for_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'cartouche',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index 01eb65e076..0012e9b961 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -205,7 +205,6 @@ $result_trees{'macro_in_brace_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/macro/macro_in_end_argument.pl 
b/tp/t/results/macro/macro_in_end_argument.pl
index eb624ca761..9de8292ed7 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -87,7 +87,6 @@ $result_trees{'macro_in_end_argument'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'cartouche',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'cartouche'
               },
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index 4d2cbb2b00..9ff1041eca 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -642,7 +642,6 @@ $result_trees{'macro_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 74bb801104..899079179e 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -1480,7 +1480,6 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -3258,7 +3257,6 @@ $result_trees{'macro_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/macro/space_macro_after_end.pl 
b/tp/t/results/macro/space_macro_after_end.pl
index e7a40e4243..d7f4308092 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -97,7 +97,6 @@ $result_trees{'space_macro_after_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
diff --git a/tp/t/results/menu/bad_beginning.pl 
b/tp/t/results/menu/bad_beginning.pl
index e7997adf49..1e56fc2a32 100644
--- a/tp/t/results/menu/bad_beginning.pl
+++ b/tp/t/results/menu/bad_beginning.pl
@@ -96,7 +96,6 @@ $result_trees{'bad_beginning'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 ca9d5be1f9..4fcb0f930e 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -225,7 +225,6 @@ $result_trees{'block_commands_in_menu_description'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'itemize',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'itemize'
                           },
@@ -380,7 +379,6 @@ $result_trees{'block_commands_in_menu_description'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'table',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'table'
                           },
@@ -462,7 +460,6 @@ $result_trees{'block_commands_in_menu_description'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'html',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'html'
                               },
@@ -561,7 +558,6 @@ $result_trees{'block_commands_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/comment_on_menu_line.pl 
b/tp/t/results/menu/comment_on_menu_line.pl
index d3dab0eaab..bd771f9c87 100644
--- a/tp/t/results/menu/comment_on_menu_line.pl
+++ b/tp/t/results/menu/comment_on_menu_line.pl
@@ -143,7 +143,6 @@ $result_trees{'comment_on_menu_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/dash_in_menu.pl 
b/tp/t/results/menu/dash_in_menu.pl
index b1fe42f8cb..e38e5942a2 100644
--- a/tp/t/results/menu/dash_in_menu.pl
+++ b/tp/t/results/menu/dash_in_menu.pl
@@ -159,7 +159,6 @@ $result_trees{'dash_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/detailmenu.pl b/tp/t/results/menu/detailmenu.pl
index 8d56691d84..f8bedb8b5a 100644
--- a/tp/t/results/menu/detailmenu.pl
+++ b/tp/t/results/menu/detailmenu.pl
@@ -194,7 +194,6 @@ $result_trees{'detailmenu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -235,7 +234,6 @@ $result_trees{'detailmenu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/detailmenu_in_description.pl 
b/tp/t/results/menu/detailmenu_in_description.pl
index 8ccbf969e5..6fbf89949a 100644
--- a/tp/t/results/menu/detailmenu_in_description.pl
+++ b/tp/t/results/menu/detailmenu_in_description.pl
@@ -176,7 +176,6 @@ $result_trees{'detailmenu_in_description'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -217,7 +216,6 @@ $result_trees{'detailmenu_in_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index f85b5385ff..741fac0140 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -314,7 +314,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -524,7 +523,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -565,7 +563,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -760,7 +757,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1089,7 +1085,6 @@ $result_trees{'detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/detailmenu_unknown_node.pl 
b/tp/t/results/menu/detailmenu_unknown_node.pl
index 45b4a3553a..08c9a74dfd 100644
--- a/tp/t/results/menu/detailmenu_unknown_node.pl
+++ b/tp/t/results/menu/detailmenu_unknown_node.pl
@@ -141,7 +141,6 @@ $result_trees{'detailmenu_unknown_node'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -182,7 +181,6 @@ $result_trees{'detailmenu_unknown_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 63c8ce37dc..c212b21b0b 100644
--- a/tp/t/results/menu/direntry_dircategory_after_first_node.pl
+++ b/tp/t/results/menu/direntry_dircategory_after_first_node.pl
@@ -219,7 +219,6 @@ $result_trees{'direntry_dircategory_after_first_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'direntry',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
diff --git a/tp/t/results/menu/empty_menu_entry_name.pl 
b/tp/t/results/menu/empty_menu_entry_name.pl
index eecec42bdb..ff41218ec0 100644
--- a/tp/t/results/menu/empty_menu_entry_name.pl
+++ b/tp/t/results/menu/empty_menu_entry_name.pl
@@ -213,7 +213,6 @@ $result_trees{'empty_menu_entry_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index 628f5f6ca1..60e872ad39 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -141,7 +141,6 @@ $result_trees{'entry_after_detailmenu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -357,7 +356,6 @@ $result_trees{'entry_after_detailmenu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -455,7 +453,6 @@ $result_trees{'entry_after_detailmenu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/example_in_menu_comment.pl 
b/tp/t/results/menu/example_in_menu_comment.pl
index 08375353e2..e09141ab3d 100644
--- a/tp/t/results/menu/example_in_menu_comment.pl
+++ b/tp/t/results/menu/example_in_menu_comment.pl
@@ -149,7 +149,6 @@ $result_trees{'example_in_menu_comment'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -217,7 +216,6 @@ $result_trees{'example_in_menu_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 665322851a..83f8cbf792 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -190,7 +190,6 @@ $result_trees{'example_in_menu_description'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -270,7 +269,6 @@ $result_trees{'example_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index fe7e57aa81..90a2f5e09e 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -196,7 +196,6 @@ $result_trees{'formats_in_menu'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'table',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'table'
                           },
@@ -456,7 +455,6 @@ $result_trees{'formats_in_menu'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'html',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'html'
                               },
@@ -662,7 +660,6 @@ $result_trees{'formats_in_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -719,7 +716,6 @@ $result_trees{'formats_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index 498bd78423..b336b6f598 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -248,7 +248,6 @@ $result_trees{'inlineraw_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/invalid_info_menu_entry.pl 
b/tp/t/results/menu/invalid_info_menu_entry.pl
index 12cbc41b12..b6fdc3ac46 100644
--- a/tp/t/results/menu/invalid_info_menu_entry.pl
+++ b/tp/t/results/menu/invalid_info_menu_entry.pl
@@ -584,7 +584,6 @@ $result_trees{'invalid_info_menu_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/menu_entry_name.pl 
b/tp/t/results/menu/menu_entry_name.pl
index ab30977d91..84885b9ab4 100644
--- a/tp/t/results/menu/menu_entry_name.pl
+++ b/tp/t/results/menu/menu_entry_name.pl
@@ -922,7 +922,6 @@ $result_trees{'menu_entry_name'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/menu_entry_name_comment.pl 
b/tp/t/results/menu/menu_entry_name_comment.pl
index b3b23bbedc..c3adca2d20 100644
--- a/tp/t/results/menu/menu_entry_name_comment.pl
+++ b/tp/t/results/menu/menu_entry_name_comment.pl
@@ -547,7 +547,6 @@ $result_trees{'menu_entry_name_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/menu_entry_no_entry.pl 
b/tp/t/results/menu/menu_entry_no_entry.pl
index a74a0165c6..babf71a9f4 100644
--- a/tp/t/results/menu/menu_entry_no_entry.pl
+++ b/tp/t/results/menu/menu_entry_no_entry.pl
@@ -187,7 +187,6 @@ $result_trees{'menu_entry_no_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 24f7537d6a..70b4506cef 100644
--- a/tp/t/results/menu/menu_entry_no_entry_location.pl
+++ b/tp/t/results/menu/menu_entry_no_entry_location.pl
@@ -254,7 +254,6 @@ $result_trees{'menu_entry_no_entry_location'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/menu_entry_node.pl 
b/tp/t/results/menu/menu_entry_node.pl
index 8e489e536b..9a066d8491 100644
--- a/tp/t/results/menu/menu_entry_node.pl
+++ b/tp/t/results/menu/menu_entry_node.pl
@@ -340,7 +340,6 @@ $result_trees{'menu_entry_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/menu_entry_node_comments.pl 
b/tp/t/results/menu/menu_entry_node_comments.pl
index d6a3c5d51d..6bccf6cc55 100644
--- a/tp/t/results/menu/menu_entry_node_comments.pl
+++ b/tp/t/results/menu/menu_entry_node_comments.pl
@@ -396,7 +396,6 @@ $result_trees{'menu_entry_node_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/menu_in_deffn.pl 
b/tp/t/results/menu/menu_in_deffn.pl
index f9b61f6f93..ff363603df 100644
--- a/tp/t/results/menu/menu_in_deffn.pl
+++ b/tp/t/results/menu/menu_in_deffn.pl
@@ -226,7 +226,6 @@ $result_trees{'menu_in_deffn'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -271,7 +270,6 @@ $result_trees{'menu_in_deffn'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index e295860ef5..e2154ea590 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -152,7 +152,6 @@ $result_trees{'menu_in_example'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'cartouche',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'cartouche'
                               },
@@ -253,7 +252,6 @@ $result_trees{'menu_in_example'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'cartouche',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'cartouche'
                           },
@@ -478,7 +476,6 @@ $result_trees{'menu_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'menu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
@@ -519,7 +516,6 @@ $result_trees{'menu_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/menu/menu_node_unterminated.pl 
b/tp/t/results/menu/menu_node_unterminated.pl
index f700cd4316..9eea38fda7 100644
--- a/tp/t/results/menu/menu_node_unterminated.pl
+++ b/tp/t/results/menu/menu_node_unterminated.pl
@@ -133,7 +133,6 @@ $result_trees{'menu_node_unterminated'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index 8df3e66369..555a44e72c 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -225,7 +225,6 @@ $result_trees{'menu_pointing_to_anchor'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/menu_title_before_entries.pl 
b/tp/t/results/menu/menu_title_before_entries.pl
index 2068233405..2352d9d83f 100644
--- a/tp/t/results/menu/menu_title_before_entries.pl
+++ b/tp/t/results/menu/menu_title_before_entries.pl
@@ -144,7 +144,6 @@ $result_trees{'menu_title_before_entries'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl 
b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
index fe729b0987..f152b60c77 100644
--- a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -443,7 +443,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -638,7 +637,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -967,7 +965,6 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/multiple_menus.pl 
b/tp/t/results/menu/multiple_menus.pl
index d76b39c37c..a1321878d4 100644
--- a/tp/t/results/menu/multiple_menus.pl
+++ b/tp/t/results/menu/multiple_menus.pl
@@ -142,7 +142,6 @@ $result_trees{'multiple_menus'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -275,7 +274,6 @@ $result_trees{'multiple_menus'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/no_colon_in_menu.pl 
b/tp/t/results/menu/no_colon_in_menu.pl
index 71e6a11786..be1ad89ca4 100644
--- a/tp/t/results/menu/no_colon_in_menu.pl
+++ b/tp/t/results/menu/no_colon_in_menu.pl
@@ -87,7 +87,6 @@ $result_trees{'no_colon_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/reference_to_external_manual.pl 
b/tp/t/results/menu/reference_to_external_manual.pl
index b7ea63dce2..d3d1a9271a 100644
--- a/tp/t/results/menu/reference_to_external_manual.pl
+++ b/tp/t/results/menu/reference_to_external_manual.pl
@@ -141,7 +141,6 @@ $result_trees{'reference_to_external_manual'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index 0e3ee8e0ab..428b2f59c3 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -391,7 +391,6 @@ $result_trees{'sc_in_menu'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -436,7 +435,6 @@ $result_trees{'sc_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -768,7 +766,6 @@ $result_trees{'sc_in_menu'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'menu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
@@ -809,7 +806,6 @@ $result_trees{'sc_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/menu/simple.pl b/tp/t/results/menu/simple.pl
index 9d753f24a9..ba4bdae4b3 100644
--- a/tp/t/results/menu/simple.pl
+++ b/tp/t/results/menu/simple.pl
@@ -438,7 +438,6 @@ $result_trees{'simple'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/simple_no_menu.pl 
b/tp/t/results/menu/simple_no_menu.pl
index 6f3807f5fe..007f607434 100644
--- a/tp/t/results/menu/simple_no_menu.pl
+++ b/tp/t/results/menu/simple_no_menu.pl
@@ -438,7 +438,6 @@ $result_trees{'simple_no_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 e630eb8898..d93a667f6c 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
@@ -742,7 +742,6 @@ $result_trees{'space_and_commands_in_menu_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index 91a7a0d28d..8effc00293 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -144,7 +144,6 @@ $result_trees{'submenu_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -234,7 +233,6 @@ $result_trees{'submenu_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -334,7 +332,6 @@ $result_trees{'submenu_in_example'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'quotation',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'quotation'
                               },
@@ -379,7 +376,6 @@ $result_trees{'submenu_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -514,7 +510,6 @@ $result_trees{'submenu_in_example'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'enumerate',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'enumerate'
                           },
@@ -572,7 +567,6 @@ $result_trees{'submenu_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'menu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
@@ -613,7 +607,6 @@ $result_trees{'submenu_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index 606c709831..771888b455 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -231,7 +231,6 @@ $result_trees{'verb_in_menu_description'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 2bd063f5ee..a1fbea3acb 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -624,7 +624,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -1075,7 +1074,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'example',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'example'
                       },
@@ -1498,7 +1496,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -1581,7 +1578,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
@@ -2149,7 +2145,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2600,7 +2595,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -3407,7 +3401,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -3858,7 +3851,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -4281,7 +4273,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
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 a7881eb0c2..e8489e6093 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
@@ -595,7 +595,6 @@ $result_trees{'comment_space_command_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/misc_commands/double_exdent.pl 
b/tp/t/results/misc_commands/double_exdent.pl
index 7dc600c903..8ced82b4c2 100644
--- a/tp/t/results/misc_commands/double_exdent.pl
+++ b/tp/t/results/misc_commands/double_exdent.pl
@@ -126,7 +126,6 @@ $result_trees{'double_exdent'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -167,7 +166,6 @@ $result_trees{'double_exdent'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl 
b/tp/t/results/misc_commands/footnote_in_center.pl
index 15da6d0047..d431b36fe0 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -159,7 +159,6 @@ $result_trees{'footnote_in_center'} = {
                                   ],
                                   'cmdname' => 'end',
                                   'extra' => {
-                                    'command_argument' => 'table',
                                     'spaces_before_argument' => ' ',
                                     'text_arg' => 'table'
                                   },
@@ -202,7 +201,6 @@ $result_trees{'footnote_in_center'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'example',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'example'
                               },
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 89b0e845d3..d230fc00c5 100644
--- a/tp/t/results/misc_commands/heading_command_in_commands.pl
+++ b/tp/t/results/misc_commands/heading_command_in_commands.pl
@@ -150,7 +150,6 @@ $result_trees{'heading_command_in_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -239,7 +238,6 @@ $result_trees{'heading_command_in_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl 
b/tp/t/results/misc_commands/indent_in_quotation.pl
index a5760068a3..435ea6af1c 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -74,7 +74,6 @@ $result_trees{'indent_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 77cb9a9fe0..b5897df9e0 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -654,7 +654,6 @@ $result_trees{'kbdinputstyle'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1207,7 +1206,6 @@ $result_trees{'kbdinputstyle'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1751,7 +1749,6 @@ $result_trees{'kbdinputstyle'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 84659b5303..68cde5b955 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -296,7 +296,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -422,7 +421,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -566,7 +564,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -686,7 +683,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -730,7 +726,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -904,7 +899,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1030,7 +1024,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1171,7 +1164,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -1287,7 +1279,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -1330,7 +1321,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1501,7 +1491,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1623,7 +1612,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1763,7 +1751,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -1879,7 +1866,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -1922,7 +1908,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl 
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index 8da68a03a6..f6ab2d8d8d 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -69,7 +69,6 @@ $result_trees{'noindent_after_smallexample'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'smallexample',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'smallexample'
               },
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 683d4231d2..711d5fe9ca 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -644,7 +644,6 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1161,7 +1160,6 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1688,7 +1686,6 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2205,7 +2202,6 @@ $result_trees{'test_allowcodebreaks'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
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 0ee305a34e..27b06aebec 100644
--- a/tp/t/results/misc_commands/text_before_line_command.pl
+++ b/tp/t/results/misc_commands/text_before_line_command.pl
@@ -254,7 +254,6 @@ $result_trees{'text_before_line_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 236dafc72c..0a1b9386eb 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -510,7 +510,6 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'direntry',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
@@ -795,7 +794,6 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -907,7 +905,6 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
@@ -1208,7 +1205,6 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'titlepage',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'titlepage'
               },
@@ -1347,7 +1343,6 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2409,7 +2404,6 @@ $result_trees{'formatting_fr'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'menu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
@@ -2450,7 +2444,6 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'format',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
@@ -2839,7 +2832,6 @@ $result_trees{'formatting_fr'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -2880,7 +2872,6 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -3132,7 +3123,6 @@ $result_trees{'formatting_fr'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 43e989e5ed..f4093b6a1b 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -510,7 +510,6 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'direntry',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'direntry'
               },
@@ -795,7 +794,6 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -907,7 +905,6 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
@@ -1208,7 +1205,6 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'titlepage',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'titlepage'
               },
@@ -1347,7 +1343,6 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2409,7 +2404,6 @@ $result_trees{'texi_formatting'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'menu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'menu'
                   },
@@ -2450,7 +2444,6 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'format',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
@@ -2839,7 +2832,6 @@ $result_trees{'texi_formatting'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'detailmenu',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'detailmenu'
                   },
@@ -2880,7 +2872,6 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -3132,7 +3123,6 @@ $result_trees{'texi_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moreindices/double_index_entry.pl 
b/tp/t/results/moreindices/double_index_entry.pl
index a7e8fc4a99..6331ca30a6 100644
--- a/tp/t/results/moreindices/double_index_entry.pl
+++ b/tp/t/results/moreindices/double_index_entry.pl
@@ -256,7 +256,6 @@ $result_trees{'double_index_entry'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moreindices/index_split.pl 
b/tp/t/results/moreindices/index_split.pl
index 5a3e167c28..a8ef4cad7d 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -518,7 +518,6 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1431,7 +1430,6 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1731,7 +1729,6 @@ $result_trees{'index_split'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moreindices/index_split_nodes.pl 
b/tp/t/results/moreindices/index_split_nodes.pl
index 38981b70a6..932e114ee1 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -518,7 +518,6 @@ $result_trees{'index_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1431,7 +1430,6 @@ $result_trees{'index_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1731,7 +1729,6 @@ $result_trees{'index_split_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moreindices/nodes_before_top.pl 
b/tp/t/results/moreindices/nodes_before_top.pl
index 83617d42f9..ce3ea0c809 100644
--- a/tp/t/results/moreindices/nodes_before_top.pl
+++ b/tp/t/results/moreindices/nodes_before_top.pl
@@ -315,7 +315,6 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -900,7 +899,6 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1271,7 +1269,6 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1522,7 +1519,6 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 caeb62c4c5..7f9e6061f9 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
@@ -374,7 +374,6 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1203,7 +1202,6 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1554,7 +1552,6 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1805,7 +1802,6 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} 
= {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 28c27b16da..8f4825d107 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
@@ -315,7 +315,6 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -900,7 +899,6 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1271,7 +1269,6 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1522,7 +1519,6 @@ $result_trees{'nodes_before_top_no_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moreindices/nodes_before_top_nodes.pl 
b/tp/t/results/moreindices/nodes_before_top_nodes.pl
index f152ee673a..cf520b686c 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_nodes.pl
@@ -315,7 +315,6 @@ $result_trees{'nodes_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -900,7 +899,6 @@ $result_trees{'nodes_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1271,7 +1269,6 @@ $result_trees{'nodes_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1522,7 +1519,6 @@ $result_trees{'nodes_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moreindices/split_chapter_index.pl 
b/tp/t/results/moreindices/split_chapter_index.pl
index aeca72067e..c6f8840bcf 100644
--- a/tp/t/results/moreindices/split_chapter_index.pl
+++ b/tp/t/results/moreindices/split_chapter_index.pl
@@ -298,7 +298,6 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -888,7 +887,6 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1083,7 +1081,6 @@ $result_trees{'split_chapter_index'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moresectioning/equivalent_nodes.pl 
b/tp/t/results/moresectioning/equivalent_nodes.pl
index 58137e04b9..2a489e516d 100644
--- a/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes.pl
@@ -342,7 +342,6 @@ $result_trees{'equivalent_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -496,7 +495,6 @@ $result_trees{'equivalent_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl 
b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
index 11ba8d3e1d..07fc7cb197 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
@@ -342,7 +342,6 @@ $result_trees{'equivalent_nodes_no_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -496,7 +495,6 @@ $result_trees{'equivalent_nodes_no_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl 
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index 212f7ec78f..6e7cc00216 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -348,7 +348,6 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -747,7 +746,6 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moresectioning/node_footnote_end.pl 
b/tp/t/results/moresectioning/node_footnote_end.pl
index 67535a6869..e7353d842b 100644
--- a/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/tp/t/results/moresectioning/node_footnote_end.pl
@@ -418,7 +418,6 @@ $result_trees{'node_footnote_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -979,7 +978,6 @@ $result_trees{'node_footnote_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moresectioning/node_footnote_separated.pl 
b/tp/t/results/moresectioning/node_footnote_separated.pl
index 1a77615cc5..ab7c231529 100644
--- a/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -418,7 +418,6 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -979,7 +978,6 @@ $result_trees{'node_footnote_separated'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moresectioning/node_footnote_use_node.pl 
b/tp/t/results/moresectioning/node_footnote_use_node.pl
index 1b338562d2..56f8a36261 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -418,7 +418,6 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -979,7 +978,6 @@ $result_trees{'node_footnote_use_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 e4e421573d..56c713a586 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -261,7 +261,6 @@ $result_trees{'nodes_after_top_before_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 85af052cc2..5271671fc1 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
@@ -261,7 +261,6 @@ 
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 18ec3715bb..8e9dd5a394 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -261,7 +261,6 @@ $result_trees{'nodes_after_top_before_section'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 fa049e6f59..e954c9bf0a 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
@@ -261,7 +261,6 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 6d0a4b81a5..fc196bb836 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
@@ -261,7 +261,6 @@ 
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 905f821ac6..97afddc513 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -442,7 +442,6 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -621,7 +620,6 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl 
b/tp/t/results/moresectioning/sectioning_frames.pl
index 8964285fc8..b7bb970b8d 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -652,7 +652,6 @@ $result_trees{'sectioning_frames'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1026,7 +1025,6 @@ $result_trees{'sectioning_frames'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1392,7 +1390,6 @@ $result_trees{'sectioning_frames'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1895,7 +1892,6 @@ $result_trees{'sectioning_frames'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moresectioning/top_node_up_explicit.pl 
b/tp/t/results/moresectioning/top_node_up_explicit.pl
index 3a4236bc45..7cb7a1d1b3 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_explicit.pl
@@ -363,7 +363,6 @@ $result_trees{'top_node_up_explicit'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moresectioning/top_node_up_implicit.pl 
b/tp/t/results/moresectioning/top_node_up_implicit.pl
index 1acc9068a1..f2e9ac766d 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_implicit.pl
@@ -269,7 +269,6 @@ $result_trees{'top_node_up_implicit'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl 
b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
index c2715e16f9..b01b3d237d 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -366,7 +366,6 @@ $result_trees{'two_footnotes_in_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 b066f093ab..96274594cd 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -366,7 +366,6 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/multitable/empty_headitem.pl 
b/tp/t/results/multitable/empty_headitem.pl
index 4bf6077a23..bd419a0426 100644
--- a/tp/t/results/multitable/empty_headitem.pl
+++ b/tp/t/results/multitable/empty_headitem.pl
@@ -276,7 +276,6 @@ $result_trees{'empty_headitem'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/empty_item_tab.pl 
b/tp/t/results/multitable/empty_item_tab.pl
index 0b9e080997..96445e34e6 100644
--- a/tp/t/results/multitable/empty_item_tab.pl
+++ b/tp/t/results/multitable/empty_item_tab.pl
@@ -213,7 +213,6 @@ $result_trees{'empty_item_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -711,7 +710,6 @@ $result_trees{'empty_item_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/empty_multitable_with_cells.pl 
b/tp/t/results/multitable/empty_multitable_with_cells.pl
index 18d0615ecc..678af5742d 100644
--- a/tp/t/results/multitable/empty_multitable_with_cells.pl
+++ b/tp/t/results/multitable/empty_multitable_with_cells.pl
@@ -110,7 +110,6 @@ $result_trees{'empty_multitable_with_cells'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 2b978c274b..40b78df74c 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -229,7 +229,6 @@ $result_trees{'inter_item_commands_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -617,7 +616,6 @@ $result_trees{'inter_item_commands_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -790,7 +788,6 @@ $result_trees{'inter_item_commands_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/multitable_begin_with_tab.pl 
b/tp/t/results/multitable/multitable_begin_with_tab.pl
index ac2a7ab677..e28d056e3a 100644
--- a/tp/t/results/multitable/multitable_begin_with_tab.pl
+++ b/tp/t/results/multitable/multitable_begin_with_tab.pl
@@ -89,7 +89,6 @@ $result_trees{'multitable_begin_with_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -254,7 +253,6 @@ $result_trees{'multitable_begin_with_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 c14707ea67..477490584f 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
@@ -69,7 +69,6 @@ 
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 5e1b05c243..45f8a054f1 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
@@ -54,7 +54,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 944a21f092..3ac8fd6561 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
@@ -69,7 +69,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 5458a4b5be..f8837945f5 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
@@ -54,7 +54,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 637b0ec0a6..2c17ba3753 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
@@ -72,7 +72,6 @@ 
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 446ffe0124..6fc3c83483 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
@@ -59,7 +59,6 @@ $result_trees{'multitable_bracketed_prototype_not_closed'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 2e7b4dedce..98aa8744e9 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
@@ -73,7 +73,6 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 06c4a6762e..97546ab269 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
@@ -73,7 +73,6 @@ 
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl 
b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
index be5a974933..afc37d3a87 100644
--- a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
+++ b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
@@ -68,7 +68,6 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/multitable_figure_space.pl 
b/tp/t/results/multitable/multitable_figure_space.pl
index 73ea3c2483..d3b2a99c77 100644
--- a/tp/t/results/multitable/multitable_figure_space.pl
+++ b/tp/t/results/multitable/multitable_figure_space.pl
@@ -253,7 +253,6 @@ $result_trees{'multitable_figure_space'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/multitable_in_example.pl 
b/tp/t/results/multitable/multitable_in_example.pl
index 1c1ce0ee05..f5c2b3db86 100644
--- a/tp/t/results/multitable/multitable_in_example.pl
+++ b/tp/t/results/multitable/multitable_in_example.pl
@@ -236,7 +236,6 @@ $result_trees{'multitable_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'multitable',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'multitable'
                   },
@@ -297,7 +296,6 @@ $result_trees{'multitable_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 899b654260..3855f4c930 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
@@ -304,7 +304,6 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 4e2cb58953..6e30629e19 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
@@ -292,7 +292,6 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 37fefb8bf5..5c5b028eae 100644
--- a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
+++ b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
@@ -231,7 +231,6 @@ $result_trees{'multitable_with_empty_item_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/not_letters_in_prototype.pl 
b/tp/t/results/multitable/not_letters_in_prototype.pl
index 054836dee3..492f5c47d0 100644
--- a/tp/t/results/multitable/not_letters_in_prototype.pl
+++ b/tp/t/results/multitable/not_letters_in_prototype.pl
@@ -113,7 +113,6 @@ $result_trees{'not_letters_in_prototype'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/paragraph_in_cells.pl 
b/tp/t/results/multitable/paragraph_in_cells.pl
index 9150c77ec0..80116b7e89 100644
--- a/tp/t/results/multitable/paragraph_in_cells.pl
+++ b/tp/t/results/multitable/paragraph_in_cells.pl
@@ -230,7 +230,6 @@ $result_trees{'paragraph_in_cells'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/prototype_brace_no_brace.pl 
b/tp/t/results/multitable/prototype_brace_no_brace.pl
index 3ef2ab040f..3902f62114 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace.pl
@@ -57,7 +57,6 @@ $result_trees{'prototype_brace_no_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 dd8b287e3f..83ccfa475b 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -73,7 +73,6 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/prototype_no_brace.pl 
b/tp/t/results/multitable/prototype_no_brace.pl
index a5e866fb15..75020b7597 100644
--- a/tp/t/results/multitable/prototype_no_brace.pl
+++ b/tp/t/results/multitable/prototype_no_brace.pl
@@ -73,7 +73,6 @@ $result_trees{'prototype_no_brace'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index a690086ff8..bea12fae11 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -475,7 +475,6 @@ $result_trees{'ref_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/multitable/w_in_multitable.pl 
b/tp/t/results/multitable/w_in_multitable.pl
index fd64fd2eec..1ea7a932fa 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -161,7 +161,6 @@ $result_trees{'w_in_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index aaa49b99a1..0935db64db 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -73,7 +73,6 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'group',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'group'
                   },
@@ -150,7 +149,6 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -270,7 +268,6 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'enumerate',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'enumerate'
                   },
@@ -446,7 +443,6 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -696,7 +692,6 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'multitable',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'multitable'
                   },
@@ -835,7 +830,6 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'float',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'float'
                   },
@@ -967,7 +961,6 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'smallexample',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'smallexample'
                   },
@@ -1039,7 +1032,6 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'format',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'format'
                   },
@@ -1111,7 +1103,6 @@ $result_trees{'commands_in_flushright'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'flushleft',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'flushleft'
                   },
@@ -1192,7 +1183,6 @@ $result_trees{'commands_in_flushright'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
diff --git a/tp/t/results/paragraph/comment_in_quotation.pl 
b/tp/t/results/paragraph/comment_in_quotation.pl
index 89b41517a6..d8216a3d59 100644
--- a/tp/t/results/paragraph/comment_in_quotation.pl
+++ b/tp/t/results/paragraph/comment_in_quotation.pl
@@ -76,7 +76,6 @@ $result_trees{'comment_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -165,7 +164,6 @@ $result_trees{'comment_in_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/paragraph/paragraph_count_and_example.pl 
b/tp/t/results/paragraph/paragraph_count_and_example.pl
index 3dc1842e7b..364fb16318 100644
--- a/tp/t/results/paragraph/paragraph_count_and_example.pl
+++ b/tp/t/results/paragraph/paragraph_count_and_example.pl
@@ -53,7 +53,6 @@ $result_trees{'paragraph_count_and_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/paragraph/paragraph_indent_asis.pl 
b/tp/t/results/paragraph/paragraph_indent_asis.pl
index b7325803ce..399deec25a 100644
--- a/tp/t/results/paragraph/paragraph_indent_asis.pl
+++ b/tp/t/results/paragraph/paragraph_indent_asis.pl
@@ -122,7 +122,6 @@ $result_trees{'paragraph_indent_asis'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
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 626b8ba43d..3fde8ac330 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
@@ -517,7 +517,6 @@ $result_trees{'at_commands_glued_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 3eb8dd808f..5c09ae3e3b 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
@@ -59,7 +59,6 @@ $result_trees{'empty_line_in_example_end'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
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 8808789dfe..45eec82f01 100644
--- a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
+++ b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
@@ -81,7 +81,6 @@ $result_trees{'empty_multitable_in_itemize'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'multitable',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'multitable'
                       },
@@ -142,7 +141,6 @@ $result_trees{'empty_multitable_in_itemize'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
diff --git a/tp/t/results/plaintext_tests/expanded_tex.pl 
b/tp/t/results/plaintext_tests/expanded_tex.pl
index ff5197658d..4095ac399e 100644
--- a/tp/t/results/plaintext_tests/expanded_tex.pl
+++ b/tp/t/results/plaintext_tests/expanded_tex.pl
@@ -70,7 +70,6 @@ $result_trees{'expanded_tex'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'tex',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
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 75ebaffcf6..a3ef2347e5 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
@@ -84,7 +84,6 @@ $result_trees{'flushright_not_closed_and_format'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
diff --git a/tp/t/results/plaintext_tests/html_expanded.pl 
b/tp/t/results/plaintext_tests/html_expanded.pl
index 361886b6c9..83cd0573c4 100644
--- a/tp/t/results/plaintext_tests/html_expanded.pl
+++ b/tp/t/results/plaintext_tests/html_expanded.pl
@@ -60,7 +60,6 @@ $result_trees{'html_expanded'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'html',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
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 cbe4e333b1..59294924d7 100644
--- a/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
+++ b/tp/t/results/plaintext_tests/insert_copying_and_paragraph.pl
@@ -53,7 +53,6 @@ $result_trees{'insert_copying_and_paragraph'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
diff --git a/tp/t/results/plaintext_tests/isolated_html_expanded.pl 
b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
index 89e6d2f74a..edf68b3ea5 100644
--- a/tp/t/results/plaintext_tests/isolated_html_expanded.pl
+++ b/tp/t/results/plaintext_tests/isolated_html_expanded.pl
@@ -59,7 +59,6 @@ $result_trees{'isolated_html_expanded'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
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 adfd6f8705..83967d025f 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
@@ -85,7 +85,6 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -202,7 +201,6 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -325,7 +323,6 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -468,7 +465,6 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'itemize',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'itemize'
                   },
@@ -522,7 +518,6 @@ $result_trees{'itemize_in_headitem_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl 
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index caff8304d8..85fa750b3b 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -390,7 +390,6 @@ $result_trees{'japanese_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
@@ -588,7 +587,6 @@ $result_trees{'japanese_utf8'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 4aa8d36b10..882b90cecd 100644
--- a/tp/t/results/plaintext_tests/line_passed_and_formats.pl
+++ b/tp/t/results/plaintext_tests/line_passed_and_formats.pl
@@ -116,7 +116,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -157,7 +156,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -255,7 +253,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -296,7 +293,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -393,7 +389,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -434,7 +429,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -506,7 +500,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -572,7 +565,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -644,7 +636,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -710,7 +701,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -807,7 +797,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -859,7 +848,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -956,7 +944,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -1008,7 +995,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1105,7 +1091,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -1157,7 +1142,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1240,7 +1224,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1334,7 +1317,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1440,7 +1422,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1546,7 +1527,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1689,7 +1669,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -1736,7 +1715,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1839,7 +1817,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -1886,7 +1863,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -2007,7 +1983,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -2060,7 +2035,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2169,7 +2143,6 @@ $result_trees{'line_passed_and_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -2222,7 +2195,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -2366,7 +2338,6 @@ $result_trees{'line_passed_and_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 0ace2caa6e..43ed6db68e 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -105,7 +105,6 @@ $result_trees{'long_uref_after_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
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 12e8341694..ecaba70053 100644
--- a/tp/t/results/plaintext_tests/multiline_image_and_align.pl
+++ b/tp/t/results/plaintext_tests/multiline_image_and_align.pl
@@ -441,7 +441,6 @@ $result_trees{'multiline_image_and_align'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
diff --git a/tp/t/results/plaintext_tests/multitable.pl 
b/tp/t/results/plaintext_tests/multitable.pl
index c4a62c0565..8419be23d8 100644
--- a/tp/t/results/plaintext_tests/multitable.pl
+++ b/tp/t/results/plaintext_tests/multitable.pl
@@ -193,7 +193,6 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -1147,7 +1146,6 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -1435,7 +1433,6 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -1604,7 +1601,6 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -1838,7 +1834,6 @@ $result_trees{'multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 a4a3664426..effa13b396 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
@@ -157,7 +157,6 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'multitable',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'multitable'
                   },
@@ -206,7 +205,6 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/plaintext_tests/nested_code_commands.pl 
b/tp/t/results/plaintext_tests/nested_code_commands.pl
index 6bc95c4c53..cffb92403a 100644
--- a/tp/t/results/plaintext_tests/nested_code_commands.pl
+++ b/tp/t/results/plaintext_tests/nested_code_commands.pl
@@ -849,7 +849,6 @@ $result_trees{'nested_code_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1286,7 +1285,6 @@ $result_trees{'nested_code_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'display',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
diff --git a/tp/t/results/plaintext_tests/nested_indentedblock.pl 
b/tp/t/results/plaintext_tests/nested_indentedblock.pl
index de5de24a2b..9c6118f84d 100644
--- a/tp/t/results/plaintext_tests/nested_indentedblock.pl
+++ b/tp/t/results/plaintext_tests/nested_indentedblock.pl
@@ -78,7 +78,6 @@ $result_trees{'nested_indentedblock'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'indentedblock',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'indentedblock'
                   },
@@ -119,7 +118,6 @@ $result_trees{'nested_indentedblock'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -221,7 +219,6 @@ $result_trees{'nested_indentedblock'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -262,7 +259,6 @@ $result_trees{'nested_indentedblock'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'indentedblock',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'indentedblock'
               },
diff --git a/tp/t/results/plaintext_tests/nested_multitable.pl 
b/tp/t/results/plaintext_tests/nested_multitable.pl
index 99c38154f1..c22621793c 100644
--- a/tp/t/results/plaintext_tests/nested_multitable.pl
+++ b/tp/t/results/plaintext_tests/nested_multitable.pl
@@ -202,7 +202,6 @@ $result_trees{'nested_multitable'} = {
                               ],
                               'cmdname' => 'end',
                               'extra' => {
-                                'command_argument' => 'multitable',
                                 'spaces_before_argument' => ' ',
                                 'text_arg' => 'multitable'
                               },
@@ -372,7 +371,6 @@ $result_trees{'nested_multitable'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
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 5e6f396d23..1dc0248846 100644
--- a/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
+++ b/tp/t/results/plaintext_tests/protect_spaces_on_line.pl
@@ -197,7 +197,6 @@ $result_trees{'protect_spaces_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index bcf69bc621..f392746883 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -1969,7 +1969,6 @@ $result_trees{'quote_node_names'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 ee5b3f2a75..b26d290398 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
@@ -94,7 +94,6 @@ $result_trees{'sp_with_text_before_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 245f11c6ec..5404e3273f 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -724,7 +724,6 @@ $result_trees{'star_at_command_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1073,7 +1072,6 @@ $result_trees{'star_at_command_formatting'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
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 e64bec469c..ef4a3793e0 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
@@ -163,7 +163,6 @@ $result_trees{'tab_in_table_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -206,7 +205,6 @@ $result_trees{'tab_in_table_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 2dd8bce7ce..1c29d0991d 100644
--- a/tp/t/results/plaintext_tests/tab_item_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_item_in_example.pl
@@ -74,7 +74,6 @@ $result_trees{'tab_item_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index a7a6832eb6..a415b11c76 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -137,7 +137,6 @@ $result_trees{'caption_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -178,7 +177,6 @@ $result_trees{'caption_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
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 1578eec800..7fff489ee7 100644
--- a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
+++ b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
@@ -87,7 +87,6 @@ $result_trees{'comment_example_and_blank_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -193,7 +192,6 @@ $result_trees{'comment_example_and_blank_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -276,7 +274,6 @@ $result_trees{'comment_example_and_blank_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -365,7 +362,6 @@ $result_trees{'comment_example_and_blank_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/comments_in_example.pl 
b/tp/t/results/preformatted/comments_in_example.pl
index 9613192478..efe132f8dd 100644
--- a/tp/t/results/preformatted/comments_in_example.pl
+++ b/tp/t/results/preformatted/comments_in_example.pl
@@ -103,7 +103,6 @@ $result_trees{'comments_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -203,7 +202,6 @@ $result_trees{'comments_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -314,7 +312,6 @@ $result_trees{'comments_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index 25ecce028d..e0c50b8da4 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -154,7 +154,6 @@ $result_trees{'def_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'defun',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'defun'
                   },
@@ -196,7 +195,6 @@ $result_trees{'def_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/empty_line.pl 
b/tp/t/results/preformatted/empty_line.pl
index 85dc54b236..48f3a7ca19 100644
--- a/tp/t/results/preformatted/empty_line.pl
+++ b/tp/t/results/preformatted/empty_line.pl
@@ -64,7 +64,6 @@ $result_trees{'empty_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/empty_line_style_command.pl 
b/tp/t/results/preformatted/empty_line_style_command.pl
index 3bce9d7b79..c46c76cce4 100644
--- a/tp/t/results/preformatted/empty_line_style_command.pl
+++ b/tp/t/results/preformatted/empty_line_style_command.pl
@@ -90,7 +90,6 @@ $result_trees{'empty_line_style_command'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/insertcopying_in_example.pl 
b/tp/t/results/preformatted/insertcopying_in_example.pl
index 94fcc03e0c..034bf7c841 100644
--- a/tp/t/results/preformatted/insertcopying_in_example.pl
+++ b/tp/t/results/preformatted/insertcopying_in_example.pl
@@ -70,7 +70,6 @@ $result_trees{'insertcopying_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/nested_example_and_comment.pl 
b/tp/t/results/preformatted/nested_example_and_comment.pl
index 9379b12fb9..d1694fb35a 100644
--- a/tp/t/results/preformatted/nested_example_and_comment.pl
+++ b/tp/t/results/preformatted/nested_example_and_comment.pl
@@ -95,7 +95,6 @@ $result_trees{'nested_example_and_comment'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -147,7 +146,6 @@ $result_trees{'nested_example_and_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -278,7 +276,6 @@ $result_trees{'nested_example_and_comment'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -330,7 +327,6 @@ $result_trees{'nested_example_and_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -461,7 +457,6 @@ $result_trees{'nested_example_and_comment'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -530,7 +525,6 @@ $result_trees{'nested_example_and_comment'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/nested_formats.pl 
b/tp/t/results/preformatted/nested_formats.pl
index 0efd30791a..a19a618e57 100644
--- a/tp/t/results/preformatted/nested_formats.pl
+++ b/tp/t/results/preformatted/nested_formats.pl
@@ -79,7 +79,6 @@ $result_trees{'nested_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example'
                   },
@@ -120,7 +119,6 @@ $result_trees{'nested_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'format',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'format'
               },
@@ -218,7 +216,6 @@ $result_trees{'nested_formats'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'format',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'format'
                   },
@@ -259,7 +256,6 @@ $result_trees{'nested_formats'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/page_in_example.pl 
b/tp/t/results/preformatted/page_in_example.pl
index 7b31dc08bf..0bfe90886e 100644
--- a/tp/t/results/preformatted/page_in_example.pl
+++ b/tp/t/results/preformatted/page_in_example.pl
@@ -65,7 +65,6 @@ $result_trees{'page_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/quote_dash_in_display.pl 
b/tp/t/results/preformatted/quote_dash_in_display.pl
index 7748c81348..f22a410eb9 100644
--- a/tp/t/results/preformatted/quote_dash_in_display.pl
+++ b/tp/t/results/preformatted/quote_dash_in_display.pl
@@ -65,7 +65,6 @@ $result_trees{'quote_dash_in_display'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'display',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
diff --git a/tp/t/results/preformatted/quote_dash_in_example.pl 
b/tp/t/results/preformatted/quote_dash_in_example.pl
index c434ee0acb..6f2e694d5e 100644
--- a/tp/t/results/preformatted/quote_dash_in_example.pl
+++ b/tp/t/results/preformatted/quote_dash_in_example.pl
@@ -65,7 +65,6 @@ $result_trees{'quote_dash_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 c7813fbdb7..4a0071a365 100644
--- a/tp/t/results/preformatted/text_on_display_command_line.pl
+++ b/tp/t/results/preformatted/text_on_display_command_line.pl
@@ -47,7 +47,6 @@ $result_trees{'text_on_display_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'display',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
@@ -125,7 +124,6 @@ $result_trees{'text_on_display_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'display',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
@@ -198,7 +196,6 @@ $result_trees{'text_on_display_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'display',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'display text after end'
               },
@@ -273,7 +270,6 @@ $result_trees{'text_on_display_command_line'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'display',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'display text after end display nested in 
display'
                   },
@@ -314,7 +310,6 @@ $result_trees{'text_on_display_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'display',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
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 bc24aad795..a4a1193ab1 100644
--- a/tp/t/results/preformatted/text_on_example_command_line.pl
+++ b/tp/t/results/preformatted/text_on_example_command_line.pl
@@ -47,7 +47,6 @@ $result_trees{'text_on_example_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -125,7 +124,6 @@ $result_trees{'text_on_example_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -198,7 +196,6 @@ $result_trees{'text_on_example_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example text after end'
               },
@@ -273,7 +270,6 @@ $result_trees{'text_on_example_command_line'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'example',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'example text after end example nested in 
example'
                   },
@@ -314,7 +310,6 @@ $result_trees{'text_on_example_command_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl 
b/tp/t/results/preformatted/titlefont_in_example.pl
index 14b668cca7..8afd0c9b15 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -80,7 +80,6 @@ $result_trees{'titlefont_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/quotation/comment_on_quotation_line.pl 
b/tp/t/results/quotation/comment_on_quotation_line.pl
index ed9f5b4bc0..91f6389a27 100644
--- a/tp/t/results/quotation/comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/comment_on_quotation_line.pl
@@ -78,7 +78,6 @@ $result_trees{'comment_on_quotation_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/quotation/empty_quotation.pl 
b/tp/t/results/quotation/empty_quotation.pl
index f3361672f7..8c83929052 100644
--- a/tp/t/results/quotation/empty_quotation.pl
+++ b/tp/t/results/quotation/empty_quotation.pl
@@ -42,7 +42,6 @@ $result_trees{'empty_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -108,7 +107,6 @@ $result_trees{'empty_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -188,7 +186,6 @@ $result_trees{'empty_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -255,7 +252,6 @@ $result_trees{'empty_quotation'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 8337363b91..f6cf022b1b 100644
--- a/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
+++ b/tp/t/results/quotation/footnote_in_quotation_with_arg.pl
@@ -90,7 +90,6 @@ $result_trees{'footnote_in_quotation_with_arg'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
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 2982969ed4..efc66b18fa 100644
--- a/tp/t/results/quotation/only_comment_on_quotation_line.pl
+++ b/tp/t/results/quotation/only_comment_on_quotation_line.pl
@@ -69,7 +69,6 @@ $result_trees{'only_comment_on_quotation_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/quotation/quotation_and_author.pl 
b/tp/t/results/quotation/quotation_and_author.pl
index b90b520955..20f8e10409 100644
--- a/tp/t/results/quotation/quotation_and_author.pl
+++ b/tp/t/results/quotation/quotation_and_author.pl
@@ -99,7 +99,6 @@ $result_trees{'quotation_and_author'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -220,7 +219,6 @@ $result_trees{'quotation_and_author'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'smallquotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'smallquotation'
               },
@@ -329,7 +327,6 @@ $result_trees{'quotation_and_author'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/quotation/quotation_author_in_example.pl 
b/tp/t/results/quotation/quotation_author_in_example.pl
index a72de770cf..9f0f96cf0b 100644
--- a/tp/t/results/quotation/quotation_author_in_example.pl
+++ b/tp/t/results/quotation/quotation_author_in_example.pl
@@ -96,7 +96,6 @@ $result_trees{'quotation_author_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -140,7 +139,6 @@ $result_trees{'quotation_author_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 b798b2609a..e910bc3e40 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
@@ -43,7 +43,6 @@ $result_trees{'quotation_beginning_and_end_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
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 4aaf64480a..207a82710e 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
@@ -79,7 +79,6 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -189,7 +188,6 @@ $result_trees{'space_at_commands_end_quotation_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/quotation/standard_quotations.pl 
b/tp/t/results/quotation/standard_quotations.pl
index a5e1c87f1b..c3666807b1 100644
--- a/tp/t/results/quotation/standard_quotations.pl
+++ b/tp/t/results/quotation/standard_quotations.pl
@@ -58,7 +58,6 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -136,7 +135,6 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -214,7 +212,6 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -292,7 +289,6 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -370,7 +366,6 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -448,7 +443,6 @@ $result_trees{'standard_quotations'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
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 2051b5a38f..619941656a 100644
--- a/tp/t/results/raw/beginning_and_end_on_line.pl
+++ b/tp/t/results/raw/beginning_and_end_on_line.pl
@@ -49,7 +49,6 @@ $result_trees{'beginning_and_end_on_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
diff --git a/tp/t/results/raw/braces_in_tex.pl 
b/tp/t/results/raw/braces_in_tex.pl
index 4297a26c8a..8c6e698e7d 100644
--- a/tp/t/results/raw/braces_in_tex.pl
+++ b/tp/t/results/raw/braces_in_tex.pl
@@ -87,7 +87,6 @@ $result_trees{'braces_in_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
@@ -209,7 +208,6 @@ $result_trees{'braces_in_tex'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'tex',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'tex'
                       },
@@ -254,7 +252,6 @@ $result_trees{'braces_in_tex'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/raw/displaymath.pl b/tp/t/results/raw/displaymath.pl
index 8d418ab3e3..a16b1e3790 100644
--- a/tp/t/results/raw/displaymath.pl
+++ b/tp/t/results/raw/displaymath.pl
@@ -85,7 +85,6 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
@@ -200,7 +199,6 @@ $result_trees{'displaymath'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'displaymath',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'displaymath'
               },
diff --git a/tp/t/results/raw/inline_in_example.pl 
b/tp/t/results/raw/inline_in_example.pl
index 43b4137e1f..dbf7824fed 100644
--- a/tp/t/results/raw/inline_in_example.pl
+++ b/tp/t/results/raw/inline_in_example.pl
@@ -260,7 +260,6 @@ $result_trees{'inline_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/raw/lone_braces_in_html.pl 
b/tp/t/results/raw/lone_braces_in_html.pl
index c7c603c94d..2844919c01 100644
--- a/tp/t/results/raw/lone_braces_in_html.pl
+++ b/tp/t/results/raw/lone_braces_in_html.pl
@@ -53,7 +53,6 @@ $result_trees{'lone_braces_in_html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -125,7 +124,6 @@ $result_trees{'lone_braces_in_html'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
diff --git a/tp/t/results/raw/misc_raw.pl b/tp/t/results/raw/misc_raw.pl
index 1689b912cc..d6d644b6f5 100644
--- a/tp/t/results/raw/misc_raw.pl
+++ b/tp/t/results/raw/misc_raw.pl
@@ -58,7 +58,6 @@ $result_trees{'misc_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -124,7 +123,6 @@ $result_trees{'misc_raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
diff --git a/tp/t/results/raw/misc_raw_comments.pl 
b/tp/t/results/raw/misc_raw_comments.pl
index 3bd60e80ba..7a5b84e4ef 100644
--- a/tp/t/results/raw/misc_raw_comments.pl
+++ b/tp/t/results/raw/misc_raw_comments.pl
@@ -90,7 +90,6 @@ $result_trees{'misc_raw_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -174,7 +173,6 @@ $result_trees{'misc_raw_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
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 9c9dd8c5ac..2d5c30be5e 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
@@ -59,7 +59,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'html',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'html'
               },
@@ -143,7 +142,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'html',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
@@ -230,7 +228,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'html',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
@@ -317,7 +314,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'html',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'html after the closing command.'
                   },
@@ -399,7 +395,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'html',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
@@ -486,7 +481,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'html',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'html. A symbol after the closing command.'
                   },
@@ -562,7 +556,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
@@ -641,7 +634,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'tex',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
@@ -728,7 +720,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'tex',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
@@ -815,7 +806,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'tex',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'tex after the closing command.'
                   },
@@ -897,7 +887,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'tex',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
@@ -984,7 +973,6 @@ $result_trees{'raw_commands_and_end_of_lines'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'tex',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'tex. A symbol after the closing command.'
                   },
diff --git a/tp/t/results/raw/raw_expanded_in_style.pl 
b/tp/t/results/raw/raw_expanded_in_style.pl
index d0e5591ce7..9ba274fdc1 100644
--- a/tp/t/results/raw/raw_expanded_in_style.pl
+++ b/tp/t/results/raw/raw_expanded_in_style.pl
@@ -64,7 +64,6 @@ $result_trees{'raw_expanded_in_style'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'html',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'html'
                           },
diff --git a/tp/t/results/raw/raw_in_example.pl 
b/tp/t/results/raw/raw_in_example.pl
index d7e3c51c7e..f165e08fe0 100644
--- a/tp/t/results/raw/raw_in_example.pl
+++ b/tp/t/results/raw/raw_in_example.pl
@@ -69,7 +69,6 @@ $result_trees{'raw_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'html',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'html'
                       },
@@ -114,7 +113,6 @@ $result_trees{'raw_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -220,7 +218,6 @@ $result_trees{'raw_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'html',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'html'
                       },
@@ -332,7 +329,6 @@ $result_trees{'raw_in_example'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'tex',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'tex'
                       },
@@ -383,7 +379,6 @@ $result_trees{'raw_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/raw/raw_in_para.pl b/tp/t/results/raw/raw_in_para.pl
index 7d5ff601ac..744e904a5a 100644
--- a/tp/t/results/raw/raw_in_para.pl
+++ b/tp/t/results/raw/raw_in_para.pl
@@ -109,7 +109,6 @@ $result_trees{'raw_in_para'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'html',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'html'
                   },
@@ -208,7 +207,6 @@ $result_trees{'raw_in_para'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'tex',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'tex'
                   },
diff --git a/tp/t/results/raw/raw_in_style.pl b/tp/t/results/raw/raw_in_style.pl
index a80a91ec0f..81ff860d48 100644
--- a/tp/t/results/raw/raw_in_style.pl
+++ b/tp/t/results/raw/raw_in_style.pl
@@ -64,7 +64,6 @@ $result_trees{'raw_in_style'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'html',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'html'
                           },
diff --git a/tp/t/results/raw/verbatim_and_verbatiminclude.pl 
b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
index f8993b7cca..00c0b2da74 100644
--- a/tp/t/results/raw/verbatim_and_verbatiminclude.pl
+++ b/tp/t/results/raw/verbatim_and_verbatiminclude.pl
@@ -189,7 +189,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -387,7 +386,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -573,7 +571,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -695,7 +692,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -816,7 +812,6 @@ $result_trees{'verbatim_and_verbatiminclude'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index a8f5c40b94..16098dccc4 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -116,7 +116,6 @@ $result_trees{'anchor_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
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 4f1e286503..b7864e5a4d 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -141,7 +141,6 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index 72d29e8654..2e3ec5cab2 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -87,7 +87,6 @@ $result_trees{'anchor_in_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index e63d808916..9f5af5c9ab 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -87,7 +87,6 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/regions/double_copying.pl 
b/tp/t/results/regions/double_copying.pl
index 27cdec70e7..93bc2df9f9 100644
--- a/tp/t/results/regions/double_copying.pl
+++ b/tp/t/results/regions/double_copying.pl
@@ -90,7 +90,6 @@ $result_trees{'double_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -131,7 +130,6 @@ $result_trees{'double_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'copying',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'copying'
               },
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index 2110c992db..cef1d48d94 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -75,7 +75,6 @@ $result_trees{'format_in_titlepage'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'format',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'format'
                       },
@@ -122,7 +121,6 @@ $result_trees{'format_in_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index f16774e13b..a0426656d9 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -75,7 +75,6 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'format',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'format'
                       },
@@ -122,7 +121,6 @@ $result_trees{'format_in_titlepage_titlepage'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'titlepage',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'titlepage'
                   },
diff --git a/tp/t/results/regions/ref_in_copying.pl 
b/tp/t/results/regions/ref_in_copying.pl
index f0813c52a1..19736a4d05 100644
--- a/tp/t/results/regions/ref_in_copying.pl
+++ b/tp/t/results/regions/ref_in_copying.pl
@@ -126,7 +126,6 @@ $result_trees{'ref_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -341,7 +340,6 @@ $result_trees{'ref_in_copying'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 37b2b919cd..11fa7ead67 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
@@ -126,7 +126,6 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
@@ -418,7 +417,6 @@ $result_trees{'ref_in_copying_insert_in_chapter'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/regions/today_in_copying.pl 
b/tp/t/results/regions/today_in_copying.pl
index 3af42694dc..db93dd577e 100644
--- a/tp/t/results/regions/today_in_copying.pl
+++ b/tp/t/results/regions/today_in_copying.pl
@@ -72,7 +72,6 @@ $result_trees{'today_in_copying'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'copying',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'copying'
                   },
diff --git a/tp/t/results/sectioning/anchor_in_footnote.pl 
b/tp/t/results/sectioning/anchor_in_footnote.pl
index 5de6d4b5d1..ae0785723d 100644
--- a/tp/t/results/sectioning/anchor_in_footnote.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote.pl
@@ -251,7 +251,6 @@ $result_trees{'anchor_in_footnote'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/anchor_in_footnote_separate.pl 
b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
index 965ac7f476..bf2c364e79 100644
--- a/tp/t/results/sectioning/anchor_in_footnote_separate.pl
+++ b/tp/t/results/sectioning/anchor_in_footnote_separate.pl
@@ -283,7 +283,6 @@ $result_trees{'anchor_in_footnote_separate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index bbd694d921..b8f4a494ea 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -185,7 +185,6 @@ $result_trees{'chapter_between_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 6c461dfe30..1ce0ed420a 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
@@ -175,7 +175,6 @@ $result_trees{'chapter_node_before_and_after_part'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 511c830f45..221647acb8 100644
--- a/tp/t/results/sectioning/character_and_spaces_in_refs.pl
+++ b/tp/t/results/sectioning/character_and_spaces_in_refs.pl
@@ -231,7 +231,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1479,7 +1478,6 @@ $result_trees{'character_and_spaces_in_refs'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 a23301d149..1ae00c36a3 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
@@ -226,7 +226,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -1474,7 +1473,6 @@ $result_trees{'character_and_spaces_in_refs_out'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index b46806a66a..984196e3ac 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -482,7 +482,6 @@ $result_trees{'complex'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -856,7 +855,6 @@ $result_trees{'complex'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -1222,7 +1220,6 @@ $result_trees{'complex'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -1725,7 +1722,6 @@ $result_trees{'complex'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index ad7019db61..ea1e155fe3 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -482,7 +482,6 @@ $result_trees{'complex_split_at_node'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -856,7 +855,6 @@ $result_trees{'complex_split_at_node'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -1222,7 +1220,6 @@ $result_trees{'complex_split_at_node'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
@@ -1725,7 +1722,6 @@ $result_trees{'complex_split_at_node'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 c2d68267ab..0e9a67d056 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
@@ -234,7 +234,6 @@ $result_trees{'contents_at_end_document_after_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 65c6f08d6b..37ea20516c 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -253,7 +253,6 @@ $result_trees{'double_node_anchor_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -337,7 +336,6 @@ $result_trees{'double_node_anchor_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -421,7 +419,6 @@ $result_trees{'double_node_anchor_float'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/sectioning/double_part.pl 
b/tp/t/results/sectioning/double_part.pl
index 184a37efc8..dc8c088394 100644
--- a/tp/t/results/sectioning/double_part.pl
+++ b/tp/t/results/sectioning/double_part.pl
@@ -175,7 +175,6 @@ $result_trees{'double_part'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/double_top_in_menu.pl 
b/tp/t/results/sectioning/double_top_in_menu.pl
index 43835b8483..323651ddc7 100644
--- a/tp/t/results/sectioning/double_top_in_menu.pl
+++ b/tp/t/results/sectioning/double_top_in_menu.pl
@@ -206,7 +206,6 @@ $result_trees{'double_top_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/empty_top_node_up.pl 
b/tp/t/results/sectioning/empty_top_node_up.pl
index eb265b6b24..294c2e54ee 100644
--- a/tp/t/results/sectioning/empty_top_node_up.pl
+++ b/tp/t/results/sectioning/empty_top_node_up.pl
@@ -168,7 +168,6 @@ $result_trees{'empty_top_node_up'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/equivalent_labels.pl 
b/tp/t/results/sectioning/equivalent_labels.pl
index 60a46f7ed4..9b8806adfa 100644
--- a/tp/t/results/sectioning/equivalent_labels.pl
+++ b/tp/t/results/sectioning/equivalent_labels.pl
@@ -160,7 +160,6 @@ $result_trees{'equivalent_labels'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -364,7 +363,6 @@ $result_trees{'equivalent_labels'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/equivalent_nodes.pl 
b/tp/t/results/sectioning/equivalent_nodes.pl
index ab634fe149..a919366cf1 100644
--- a/tp/t/results/sectioning/equivalent_nodes.pl
+++ b/tp/t/results/sectioning/equivalent_nodes.pl
@@ -174,7 +174,6 @@ $result_trees{'equivalent_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/explicit_node_directions.pl 
b/tp/t/results/sectioning/explicit_node_directions.pl
index 0b48b539bc..bfcae6fa6d 100644
--- a/tp/t/results/sectioning/explicit_node_directions.pl
+++ b/tp/t/results/sectioning/explicit_node_directions.pl
@@ -190,7 +190,6 @@ $result_trees{'explicit_node_directions'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/external_node_in_menu.pl 
b/tp/t/results/sectioning/external_node_in_menu.pl
index 1ed5a94c12..a9c629e328 100644
--- a/tp/t/results/sectioning/external_node_in_menu.pl
+++ b/tp/t/results/sectioning/external_node_in_menu.pl
@@ -297,7 +297,6 @@ $result_trees{'external_node_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 fb782442bc..ca57c820a4 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
@@ -437,7 +437,6 @@ $result_trees{'in_menu_only_special_spaces_node'} = {
               ],
               "cmdname" => "end",
               "extra" => {
-                "command_argument" => "menu",
                 "spaces_before_argument" => " ",
                 "text_arg" => "menu"
               },
diff --git a/tp/t/results/sectioning/internal_top_node_up.pl 
b/tp/t/results/sectioning/internal_top_node_up.pl
index 0a3c2153dc..c11bd109a4 100644
--- a/tp/t/results/sectioning/internal_top_node_up.pl
+++ b/tp/t/results/sectioning/internal_top_node_up.pl
@@ -169,7 +169,6 @@ $result_trees{'internal_top_node_up'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index a3250e98dd..e29fa7e28b 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -170,7 +170,6 @@ $result_trees{'lone_Top_node'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/loop_nodes.pl 
b/tp/t/results/sectioning/loop_nodes.pl
index 5f6e1db3c0..431ebe7069 100644
--- a/tp/t/results/sectioning/loop_nodes.pl
+++ b/tp/t/results/sectioning/loop_nodes.pl
@@ -210,7 +210,6 @@ $result_trees{'loop_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -384,7 +383,6 @@ $result_trees{'loop_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -578,7 +576,6 @@ $result_trees{'loop_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/lowered_subsubsection.pl 
b/tp/t/results/sectioning/lowered_subsubsection.pl
index 54a1abe9a3..53d01044d9 100644
--- a/tp/t/results/sectioning/lowered_subsubsection.pl
+++ b/tp/t/results/sectioning/lowered_subsubsection.pl
@@ -163,7 +163,6 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -356,7 +355,6 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -551,7 +549,6 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -803,7 +800,6 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1087,7 +1083,6 @@ $result_trees{'lowered_subsubsection'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/menutextorder.pl 
b/tp/t/results/sectioning/menutextorder.pl
index 637c0c5db8..9d6ca63bd5 100644
--- a/tp/t/results/sectioning/menutextorder.pl
+++ b/tp/t/results/sectioning/menutextorder.pl
@@ -156,7 +156,6 @@ $result_trees{'menutextorder'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -344,7 +343,6 @@ $result_trees{'menutextorder'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -813,7 +811,6 @@ $result_trees{'menutextorder'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/more_sections_than_nodes.pl 
b/tp/t/results/sectioning/more_sections_than_nodes.pl
index a68313a372..750ea95778 100644
--- a/tp/t/results/sectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/sectioning/more_sections_than_nodes.pl
@@ -282,7 +282,6 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -681,7 +680,6 @@ $result_trees{'more_sections_than_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 58bb5a4aa8..3568ba5e06 100644
--- a/tp/t/results/sectioning/next_in_menu_is_below.pl
+++ b/tp/t/results/sectioning/next_in_menu_is_below.pl
@@ -168,7 +168,6 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -420,7 +419,6 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -615,7 +613,6 @@ $result_trees{'next_in_menu_is_below'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 738f82d9d0..979acb519c 100644
--- a/tp/t/results/sectioning/next_no_prev_to_node.pl
+++ b/tp/t/results/sectioning/next_no_prev_to_node.pl
@@ -184,7 +184,6 @@ $result_trees{'next_no_prev_to_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/no_element.pl 
b/tp/t/results/sectioning/no_element.pl
index 9866ec5637..11368bbf8e 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -420,7 +420,6 @@ $result_trees{'no_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -599,7 +598,6 @@ $result_trees{'no_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/node_nested_parentheses.pl 
b/tp/t/results/sectioning/node_nested_parentheses.pl
index e71be0166d..bed0d08156 100644
--- a/tp/t/results/sectioning/node_nested_parentheses.pl
+++ b/tp/t/results/sectioning/node_nested_parentheses.pl
@@ -385,7 +385,6 @@ $result_trees{'node_nested_parentheses'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 8cdc0a65a0..e3ac201130 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_chapter.pl
@@ -226,7 +226,6 @@ $result_trees{'node_part_chapter_after_chapter'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 d93ee1121b..94e16fe6a3 100644
--- a/tp/t/results/sectioning/node_part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/node_part_chapter_after_top.pl
@@ -169,7 +169,6 @@ $result_trees{'node_part_chapter_after_top'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/node_referenced_in_ref.pl 
b/tp/t/results/sectioning/node_referenced_in_ref.pl
index 244813366c..42f4187cff 100644
--- a/tp/t/results/sectioning/node_referenced_in_ref.pl
+++ b/tp/t/results/sectioning/node_referenced_in_ref.pl
@@ -127,7 +127,6 @@ $result_trees{'node_referenced_in_ref'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/node_up_external_node.pl 
b/tp/t/results/sectioning/node_up_external_node.pl
index 19c2f64b25..9f7c82a936 100644
--- a/tp/t/results/sectioning/node_up_external_node.pl
+++ b/tp/t/results/sectioning/node_up_external_node.pl
@@ -134,7 +134,6 @@ $result_trees{'node_up_external_node'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/nodename_parentheses.pl 
b/tp/t/results/sectioning/nodename_parentheses.pl
index 7bc8d283b3..93cb8857fb 100644
--- a/tp/t/results/sectioning/nodename_parentheses.pl
+++ b/tp/t/results/sectioning/nodename_parentheses.pl
@@ -297,7 +297,6 @@ $result_trees{'nodename_parentheses'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 ccc29b07fc..dc5a73d104 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
@@ -190,7 +190,6 @@ $result_trees{'nodes_after_top_before_chapter_nodes'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 cad6af6e43..44ba8c0b8d 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
@@ -195,7 +195,6 @@ $result_trees{'nodes_after_top_before_chapter_not_split'} = 
{
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 6d63912204..d3dbc33fce 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
@@ -195,7 +195,6 @@ 
$result_trees{'nodes_after_top_before_chapter_not_split_no_use_node_directions'}
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 1fbc26fa03..926886cdfd 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
@@ -190,7 +190,6 @@ $result_trees{'nodes_after_top_before_chapter_sections'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 90cd9d4c3e..7a2761f941 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
@@ -190,7 +190,6 @@ $result_trees{'nodes_after_top_before_section_nodes'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 3465adf5b0..d88a644991 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
@@ -190,7 +190,6 @@ $result_trees{'nodes_after_top_before_section_sections'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index adf1b694bf..0aea99255b 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -208,7 +208,6 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -525,7 +524,6 @@ $result_trees{'nodes_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 c43fa3e09c..f9eb225be7 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
@@ -167,7 +167,6 @@ $result_trees{'nodes_no_node_top_explicit_directions'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 d04fe01995..e7eabdbc70 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
@@ -340,7 +340,6 @@ $result_trees{'non_automatic_internal_top_node_up'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 86799a2b4d..da78befb9b 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
@@ -340,7 +340,6 @@ $result_trees{'non_automatic_top_node_up_and_url'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 9cfbb7e64c..511d101e8a 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
@@ -238,7 +238,6 @@ $result_trees{'non_automatic_top_node_up_url'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/novalidate.pl 
b/tp/t/results/sectioning/novalidate.pl
index 8d8eb80675..0c0d61fac8 100644
--- a/tp/t/results/sectioning/novalidate.pl
+++ b/tp/t/results/sectioning/novalidate.pl
@@ -168,7 +168,6 @@ $result_trees{'novalidate'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/part_chapter_after_top.pl 
b/tp/t/results/sectioning/part_chapter_after_top.pl
index 161cbcf3ef..3ba4cbdcd4 100644
--- a/tp/t/results/sectioning/part_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_chapter_after_top.pl
@@ -169,7 +169,6 @@ $result_trees{'part_chapter_after_top'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/part_node_after_top.pl 
b/tp/t/results/sectioning/part_node_after_top.pl
index 15646f7eda..026f4272a4 100644
--- a/tp/t/results/sectioning/part_node_after_top.pl
+++ b/tp/t/results/sectioning/part_node_after_top.pl
@@ -169,7 +169,6 @@ $result_trees{'part_node_after_top'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/part_node_before_top.pl 
b/tp/t/results/sectioning/part_node_before_top.pl
index 24ba4e5f38..fbdef4a112 100644
--- a/tp/t/results/sectioning/part_node_before_top.pl
+++ b/tp/t/results/sectioning/part_node_before_top.pl
@@ -287,7 +287,6 @@ $result_trees{'part_node_before_top'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 49dd6831ed..007e5ccf8a 100644
--- a/tp/t/results/sectioning/part_node_chapter_after_top.pl
+++ b/tp/t/results/sectioning/part_node_chapter_after_top.pl
@@ -226,7 +226,6 @@ $result_trees{'part_node_chapter_after_top'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/part_node_chapter_appendix.pl 
b/tp/t/results/sectioning/part_node_chapter_appendix.pl
index 5c096506fa..214d8c8e42 100644
--- a/tp/t/results/sectioning/part_node_chapter_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_appendix.pl
@@ -169,7 +169,6 @@ $result_trees{'part_node_chapter_appendix'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 6da150561f..efae654138 100644
--- a/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_chapter_node_appendix.pl
@@ -226,7 +226,6 @@ $result_trees{'part_node_chapter_node_appendix'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 06151e0ebb..73babdffbf 100644
--- a/tp/t/results/sectioning/part_node_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_node_part_appendix.pl
@@ -226,7 +226,6 @@ $result_trees{'part_node_node_part_appendix'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/part_node_part_appendix.pl 
b/tp/t/results/sectioning/part_node_part_appendix.pl
index e5d23fdae7..a83005f18b 100644
--- a/tp/t/results/sectioning/part_node_part_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_appendix.pl
@@ -169,7 +169,6 @@ $result_trees{'part_node_part_appendix'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 8c78368229..9e731950a8 100644
--- a/tp/t/results/sectioning/part_node_part_node_appendix.pl
+++ b/tp/t/results/sectioning/part_node_part_node_appendix.pl
@@ -226,7 +226,6 @@ $result_trees{'part_node_part_node_appendix'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index 5fb54b1bcc..264335efff 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -349,7 +349,6 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -528,7 +527,6 @@ $result_trees{'placed_things_before_element'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index 059bd38f6c..d8636f1e6b 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -349,7 +349,6 @@ $result_trees{'placed_things_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -528,7 +527,6 @@ $result_trees{'placed_things_before_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index ff6dc97c18..b986dac371 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -198,7 +198,6 @@ $result_trees{'protected_node_parentheses'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/raiselowersections.pl 
b/tp/t/results/sectioning/raiselowersections.pl
index f10c004f4f..261c84afef 100644
--- a/tp/t/results/sectioning/raiselowersections.pl
+++ b/tp/t/results/sectioning/raiselowersections.pl
@@ -249,7 +249,6 @@ $result_trees{'raiselowersections'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -442,7 +441,6 @@ $result_trees{'raiselowersections'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -725,7 +723,6 @@ $result_trees{'raiselowersections'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -921,7 +918,6 @@ $result_trees{'raiselowersections'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/rec_nodes.pl 
b/tp/t/results/sectioning/rec_nodes.pl
index 68eca6eebb..948c15c406 100644
--- a/tp/t/results/sectioning/rec_nodes.pl
+++ b/tp/t/results/sectioning/rec_nodes.pl
@@ -195,7 +195,6 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -443,7 +442,6 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -642,7 +640,6 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -830,7 +827,6 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1052,7 +1048,6 @@ $result_trees{'rec_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/section_before_top.pl 
b/tp/t/results/sectioning/section_before_top.pl
index dda9d24c23..497f780918 100644
--- a/tp/t/results/sectioning/section_before_top.pl
+++ b/tp/t/results/sectioning/section_before_top.pl
@@ -273,7 +273,6 @@ $result_trees{'section_before_top'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/section_below_unnumbered.pl 
b/tp/t/results/sectioning/section_below_unnumbered.pl
index f7280b48a8..6420936331 100644
--- a/tp/t/results/sectioning/section_below_unnumbered.pl
+++ b/tp/t/results/sectioning/section_below_unnumbered.pl
@@ -227,7 +227,6 @@ $result_trees{'section_below_unnumbered'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -428,7 +427,6 @@ $result_trees{'section_below_unnumbered'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 4edba287d1..e1f68754fd 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -251,7 +251,6 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -446,7 +445,6 @@ $result_trees{'section_chapter_before_top_nodes'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/section_in_unnumbered_info.pl 
b/tp/t/results/sectioning/section_in_unnumbered_info.pl
index 3e81a8cbf4..153ee134d3 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_info.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_info.pl
@@ -443,7 +443,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -638,7 +637,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -910,7 +908,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1239,7 +1236,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1605,7 +1601,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -2108,7 +2103,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -2614,7 +2608,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -2980,7 +2973,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -3560,7 +3552,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -3832,7 +3823,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -4104,7 +4094,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -4376,7 +4365,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -4742,7 +4730,6 @@ $result_trees{'section_in_unnumbered_info'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl 
b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
index a3061056e3..696727a521 100644
--- a/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
+++ b/tp/t/results/sectioning/section_in_unnumbered_plaintext.pl
@@ -454,7 +454,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -649,7 +648,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -921,7 +919,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1250,7 +1247,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1616,7 +1612,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -2119,7 +2114,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -2625,7 +2619,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -2991,7 +2984,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -3571,7 +3563,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -3843,7 +3834,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -4115,7 +4105,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -4387,7 +4376,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -4753,7 +4741,6 @@ $result_trees{'section_in_unnumbered_plaintext'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/semi_auto.pl 
b/tp/t/results/sectioning/semi_auto.pl
index cc825f98ae..876e39254a 100644
--- a/tp/t/results/sectioning/semi_auto.pl
+++ b/tp/t/results/sectioning/semi_auto.pl
@@ -225,7 +225,6 @@ $result_trees{'semi_auto'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -420,7 +419,6 @@ $result_trees{'semi_auto'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/space_in_node.pl 
b/tp/t/results/sectioning/space_in_node.pl
index bd94b86f0e..6f7bda436d 100644
--- a/tp/t/results/sectioning/space_in_node.pl
+++ b/tp/t/results/sectioning/space_in_node.pl
@@ -270,7 +270,6 @@ $result_trees{'space_in_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/special_spaces_in_nodes.pl 
b/tp/t/results/sectioning/special_spaces_in_nodes.pl
index 7423a33448..2cecc5996e 100644
--- a/tp/t/results/sectioning/special_spaces_in_nodes.pl
+++ b/tp/t/results/sectioning/special_spaces_in_nodes.pl
@@ -650,7 +650,6 @@ $result_trees{'special_spaces_in_nodes'} = {
               ],
               "cmdname" => "end",
               "extra" => {
-                "command_argument" => "menu",
                 "spaces_before_argument" => " ",
                 "text_arg" => "menu"
               },
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 7649b277a8..5fae0aad47 100644
--- a/tp/t/results/sectioning/top_node_no_menu_direction.pl
+++ b/tp/t/results/sectioning/top_node_no_menu_direction.pl
@@ -184,7 +184,6 @@ $result_trees{'top_node_no_menu_direction'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/top_node_up_url.pl 
b/tp/t/results/sectioning/top_node_up_url.pl
index b45aafd416..9b1bfcb667 100644
--- a/tp/t/results/sectioning/top_node_up_url.pl
+++ b/tp/t/results/sectioning/top_node_up_url.pl
@@ -169,7 +169,6 @@ $result_trees{'top_node_up_url'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/topic_guide.pl 
b/tp/t/results/sectioning/topic_guide.pl
index ecdbd594ba..e41cbad75a 100644
--- a/tp/t/results/sectioning/topic_guide.pl
+++ b/tp/t/results/sectioning/topic_guide.pl
@@ -271,7 +271,6 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -597,7 +596,6 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -802,7 +800,6 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1038,7 +1035,6 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1223,7 +1219,6 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1441,7 +1436,6 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1723,7 +1717,6 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -2011,7 +2004,6 @@ $result_trees{'topic_guide'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl 
b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
index d9f1bbb2dc..1a168e0deb 100644
--- a/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
+++ b/tp/t/results/sectioning/transliterated_split_equivalent_nodes.pl
@@ -278,7 +278,6 @@ $result_trees{'transliterated_split_equivalent_nodes'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
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 334ff069c2..81a466c9b8 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -289,7 +289,6 @@ $result_trees{'two_nodes_at_the_end'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/two_nodes_between_chapters.pl 
b/tp/t/results/sectioning/two_nodes_between_chapters.pl
index 79399ea7d4..6799064d03 100644
--- a/tp/t/results/sectioning/two_nodes_between_chapters.pl
+++ b/tp/t/results/sectioning/two_nodes_between_chapters.pl
@@ -289,7 +289,6 @@ $result_trees{'two_nodes_between_chapters'} = [
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'menu',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'menu'
                       },
diff --git a/tp/t/results/sectioning/unknown_node_in_menu.pl 
b/tp/t/results/sectioning/unknown_node_in_menu.pl
index 57db581250..dccc583a67 100644
--- a/tp/t/results/sectioning/unknown_node_in_menu.pl
+++ b/tp/t/results/sectioning/unknown_node_in_menu.pl
@@ -127,7 +127,6 @@ $result_trees{'unknown_node_in_menu'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
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 bbf801bc7d..2743ca763f 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -154,7 +154,6 @@ $result_trees{'set_in_item_missing_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -302,7 +301,6 @@ $result_trees{'set_in_item_missing_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/value/set_on_item_line.pl 
b/tp/t/results/value/set_on_item_line.pl
index d31cbb9a53..8b480a917e 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -263,7 +263,6 @@ $result_trees{'set_on_item_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -553,7 +552,6 @@ $result_trees{'set_on_item_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index 2d6bb6352e..7854821776 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -1117,7 +1117,6 @@ $result_trees{'value_in_misc_commands'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
diff --git a/tp/t/results/value/value_in_node.pl 
b/tp/t/results/value/value_in_node.pl
index 6fd89096d8..0a8af69099 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -281,7 +281,6 @@ $result_trees{'value_in_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -548,7 +547,6 @@ $result_trees{'value_in_node'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index c513265605..1d41c14dcf 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -595,7 +595,6 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -772,7 +771,6 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -875,7 +873,6 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -997,7 +994,6 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -1169,7 +1165,6 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => '  ',
                 'text_arg' => 'tex'
               },
@@ -1241,7 +1236,6 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => '  ',
                 'text_arg' => 'example'
               },
@@ -1354,7 +1348,6 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => '   ',
                 'text_arg' => 'table'
               },
@@ -1765,7 +1758,6 @@ $result_trees{'commands_and_spaces'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'deffn',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'deffn'
               },
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index 55e751c139..a4a256dd83 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -92,7 +92,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -171,7 +170,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -302,7 +300,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -393,7 +390,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -482,7 +478,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -571,7 +566,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -744,7 +738,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -851,7 +844,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -951,7 +943,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
@@ -1040,7 +1031,6 @@ $result_trees{'comments_end_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'raggedright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'raggedright'
               },
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 8d96ea9a40..8d8803c2e5 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
@@ -91,7 +91,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -202,7 +201,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -319,7 +317,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -444,7 +441,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'itemize',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'itemize'
               },
@@ -549,7 +545,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -660,7 +655,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'enumerate',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'enumerate'
               },
@@ -792,7 +786,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -882,7 +875,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -977,7 +969,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1066,7 +1057,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'group',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'group'
               },
@@ -1155,7 +1145,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1287,7 +1276,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1406,7 +1394,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1535,7 +1522,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1624,7 +1610,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'display',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'display'
               },
@@ -1798,7 +1783,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -1970,7 +1954,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'multitable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'multitable'
               },
@@ -2098,7 +2081,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
@@ -2197,7 +2179,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'flushright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'flushright'
               },
@@ -2286,7 +2267,6 @@ $result_trees{'comments_on_block_command_lines'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'raggedright',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'raggedright'
               },
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 ce096d1f74..015de5616c 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -359,7 +359,6 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -476,7 +475,6 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -735,7 +733,6 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1079,7 +1076,6 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'menu',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'menu'
               },
@@ -1571,7 +1567,6 @@ $result_trees{'image_inline_or_not'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'float',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'float'
               },
diff --git a/tp/t/results/xml_tests/raw.pl b/tp/t/results/xml_tests/raw.pl
index 9db9a9aee9..f847fab0d1 100644
--- a/tp/t/results/xml_tests/raw.pl
+++ b/tp/t/results/xml_tests/raw.pl
@@ -53,7 +53,6 @@ $result_trees{'raw'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
@@ -132,7 +131,6 @@ $result_trees{'raw'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'xml',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'xml'
                   },
diff --git a/tp/t/results/xml_tests/raw_and_comments.pl 
b/tp/t/results/xml_tests/raw_and_comments.pl
index 9a5285e77a..2dd7ac6b79 100644
--- a/tp/t/results/xml_tests/raw_and_comments.pl
+++ b/tp/t/results/xml_tests/raw_and_comments.pl
@@ -86,7 +86,6 @@ $result_trees{'raw_and_comments'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'tex',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'tex'
               },
@@ -199,7 +198,6 @@ $result_trees{'raw_and_comments'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'xml',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'xml'
                   },
diff --git a/tp/t/results/xml_tests/spaces_info_lost.pl 
b/tp/t/results/xml_tests/spaces_info_lost.pl
index 2492a4e4ae..2d272d3112 100644
--- a/tp/t/results/xml_tests/spaces_info_lost.pl
+++ b/tp/t/results/xml_tests/spaces_info_lost.pl
@@ -58,7 +58,6 @@ $result_trees{'spaces_info_lost'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'display',
                 'spaces_before_argument' => '  ',
                 'text_arg' => 'display'
               },
diff --git a/tp/t/results/xtable/accent_on_table_line.pl 
b/tp/t/results/xtable/accent_on_table_line.pl
index aad2df401a..91a7cbcf01 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -162,7 +162,6 @@ $result_trees{'accent_on_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -352,7 +351,6 @@ $result_trees{'accent_on_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/xtable/block_commands_in_table.pl 
b/tp/t/results/xtable/block_commands_in_table.pl
index b0d4496d40..b017584b3e 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -294,7 +294,6 @@ $result_trees{'block_commands_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'example',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'example'
                           },
@@ -469,7 +468,6 @@ $result_trees{'block_commands_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'quotation',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'quotation'
                           },
@@ -593,7 +591,6 @@ $result_trees{'block_commands_in_table'} = {
                           ],
                           'cmdname' => 'end',
                           'extra' => {
-                            'command_argument' => 'quotation',
                             'spaces_before_argument' => ' ',
                             'text_arg' => 'quotation'
                           },
@@ -642,7 +639,6 @@ $result_trees{'block_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -897,7 +893,6 @@ $result_trees{'block_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
@@ -1099,7 +1094,6 @@ $result_trees{'block_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
@@ -1299,7 +1293,6 @@ $result_trees{'block_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
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 1b18803ec4..58f2c909d0 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -118,7 +118,6 @@ $result_trees{'comment_and_itemx_before_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl 
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index e2d56f59ab..0d6b420383 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -183,7 +183,6 @@ $result_trees{'definfoenclose_on_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/xtable/empty_item_itemx.pl 
b/tp/t/results/xtable/empty_item_itemx.pl
index 91e49199cd..e9589e8b91 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -282,7 +282,6 @@ $result_trees{'empty_item_itemx'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
diff --git a/tp/t/results/xtable/headitem_in_table.pl 
b/tp/t/results/xtable/headitem_in_table.pl
index a00acb24cc..6964ea881b 100644
--- a/tp/t/results/xtable/headitem_in_table.pl
+++ b/tp/t/results/xtable/headitem_in_table.pl
@@ -139,7 +139,6 @@ $result_trees{'headitem_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 6477cdab93..ec983229f2 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -299,7 +299,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
@@ -507,7 +506,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'vtable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'vtable'
               },
@@ -932,7 +930,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'ftable',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'ftable'
               },
@@ -1129,7 +1126,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1302,7 +1298,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1499,7 +1494,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1672,7 +1666,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -1846,7 +1839,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -2014,7 +2006,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -2182,7 +2173,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
@@ -2444,7 +2434,6 @@ $result_trees{'inter_item_commands_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
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 20a10d73c6..64232eaba7 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
@@ -332,7 +332,6 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -375,7 +374,6 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => '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 c33e6f9a72..7a4cd60ab6 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
@@ -85,7 +85,6 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/xtable/itemx_before_item.pl 
b/tp/t/results/xtable/itemx_before_item.pl
index ae4149f9f3..5a1fbd5aaf 100644
--- a/tp/t/results/xtable/itemx_before_item.pl
+++ b/tp/t/results/xtable/itemx_before_item.pl
@@ -94,7 +94,6 @@ $result_trees{'itemx_before_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/xtable/long_item.pl b/tp/t/results/xtable/long_item.pl
index 053092848c..4538d4e786 100644
--- a/tp/t/results/xtable/long_item.pl
+++ b/tp/t/results/xtable/long_item.pl
@@ -145,7 +145,6 @@ $result_trees{'long_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
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 6dbe35f963..10884e2109 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
@@ -100,7 +100,6 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/xtable/no_argument_for_table.pl 
b/tp/t/results/xtable/no_argument_for_table.pl
index 25c9fcb7da..89f82540c0 100644
--- a/tp/t/results/xtable/no_argument_for_table.pl
+++ b/tp/t/results/xtable/no_argument_for_table.pl
@@ -105,7 +105,6 @@ $result_trees{'no_argument_for_table'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index a248e8a2bb..c3c85fd764 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -494,7 +494,6 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'vtable',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'vtable'
                   },
@@ -694,7 +693,6 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -748,7 +746,6 @@ $result_trees{'table_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
@@ -1096,7 +1093,6 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'vtable',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'vtable'
                   },
@@ -1296,7 +1292,6 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'table',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'table'
                   },
@@ -1350,7 +1345,6 @@ $result_trees{'table_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'example',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'example'
               },
@@ -1712,7 +1706,6 @@ $result_trees{'table_nested'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'vtable',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'vtable'
                       },
@@ -1912,7 +1905,6 @@ $result_trees{'table_nested'} = {
                       ],
                       'cmdname' => 'end',
                       'extra' => {
-                        'command_argument' => 'table',
                         'spaces_before_argument' => ' ',
                         'text_arg' => 'table'
                       },
@@ -1966,7 +1958,6 @@ $result_trees{'table_nested'} = {
                   ],
                   'cmdname' => 'end',
                   'extra' => {
-                    'command_argument' => 'quotation',
                     'spaces_before_argument' => ' ',
                     'text_arg' => 'quotation'
                   },
@@ -2007,7 +1998,6 @@ $result_trees{'table_nested'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'quotation',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'quotation'
               },
diff --git a/tp/t/results/xtable/text_between_item_itemx.pl 
b/tp/t/results/xtable/text_between_item_itemx.pl
index 6870596cbf..b1bee5edda 100644
--- a/tp/t/results/xtable/text_between_item_itemx.pl
+++ b/tp/t/results/xtable/text_between_item_itemx.pl
@@ -139,7 +139,6 @@ $result_trees{'text_between_item_itemx'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
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 54f3d88784..6599249143 100644
--- a/tp/t/results/xtable/title_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/title_and_itemx_before_item.pl
@@ -111,7 +111,6 @@ $result_trees{'title_and_itemx_before_item'} = {
               ],
               'cmdname' => 'end',
               'extra' => {
-                'command_argument' => 'table',
                 'spaces_before_argument' => ' ',
                 'text_arg' => 'table'
               },
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index d297bc5377..7e0a7f4ca5 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', 'command_argument');
+  'spaces_before_argument', 'end_command', '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]